Additional entities, fixing namespaces