Improved namespace section.