More stuff in TOFCalc structure