Merge "Update Parser to use NamespaceInfo"