Upgraded routing namespacing