Support Waypoint/Namespaces