Updated PaymentModule and Service for EBS