Enhance variable manipulation in rally