Added base namespace and registered others