Refactored data model.