Last changes on ANTLR grammar