Added an expression optimizer