Adding locators and methods for namespace cleanup