Added expressions to grammar