Refactored DataModel