Made fields public in CalcData