Adding support for namespacing.