Refactoring the namespace.
Provide extra ways to register stuff.