Handle both namespaces depending on parser used