Added new service classes