Partial commit.
Expression support