Merged Payer and CustomPayer classes