Add support for multiple namespaces