change Expr to include type info