Namespaces fix
Made functional