Refactoring data model