Added expression parser using ANTLR