Finish Data Model refactor