Updated parsing for Chunky 1.20+