Data Model refactoring