Updates to generated code in DataFile and EvaluateSystem