Update for new vars syntax