Added new model classes