update service to match new definitions