Changed some service definitions