Readd isolated namespace
Fix namespacing