Added support to modify charges/flights. [Issue #26, #27]