Added generics to Expr types