Refactored a bit data model