Updated ANTLR grammar