Added class= parameters to the service definitions.