Refactoring Data model objects