updated model classes and service classes