Refactor Model data loading