Enhancement: Expect URLs for all services