Add rudimentary support for namespaces