add expression support