Add support for saved expressions