Updated the expression templates