Add support for nested expressions