Conversion to new payment modules