Namespacing and improvements