added general structure like namespaces etc