Change parser to use ISO3 instead of ISO2