Added compound expression
Added tree rewrite rules