Improved expression support