Updated to support simple expressions of two columns