Started refactoring model classes