Add support for namespaces