Add support for subexpressions