Data model refactoring