fixed configuration and namespaces