adding support for multiple namespaces