adapt parsing code to new namespaces