Add full support for expressions