Added support for namespaces