Now with support for expressions