Changed the service API a bit.