updated expression support