Add new namespace for refactoring