Fix to Charge and record all Api requests