updated model classes