First revision of service definition