Changed namespaces and entities