Feature/new namespaces