2005+ parsers update

Addressing QAs.