Add input expression parsing