Adding expression parsing for all values.