Updated parser to latest definition