Refactored data model