Reworked namespaces