Modify input variable parsing