Fixed the services' definitions