Enhancement/multiple namespaces