add support for new expressions