update to use new service definitions