Introduce new namespaces, much clearer and simple to understand