Adding expanded version of the expression grammar
Adding filters to expression grammar