Support new variable names