Refactor copy version work