Changed calculation data value to be generic dictionary