OFC-1115 Use RESTful URLs