Added NamespaceUtils