Updated 2.0 parser to more generally grab criteria ids