adding support for namespaces