Finished work on the new model classes