Reformated the services definition.