Data model refactor