Minor changes on service definition