Added support for expressions.