Added support for new expressions