Extending parser to support expressions