Added support for endpoint subpaths