Add withPaymentCalendar