Refactored Move methods