Fix parser to match supinfo's changes