Refactor object copy