ChargesMatcher refactored