Add support for inner expressions