Refactored copy and paste features