Changed to new service implementation