Changed ChargeDataPoint into the more general DataPoint with information of charge income and outcome.