Reorder cloning and add migrate