Adding more rules for expressions