Mod: add index number to VariableEntry and ParameterEntry