Handle clones upstream instead of creating clone fns