Moved stuff around
Service interface now covers all functionality