Changes required to accommodate to new VariablesSystem API