Added support for quoted expressions