Updated parser and grammar from Modulo extension