Added namespaces and vendor name