Updated the model classes