Fixed up the service and changed class name