Refactored the mail classes, adding ChargeProfile