Improved namespace.