Copier framework refactorings