Changed antlr generation