Now has cleaner namespaces