New classes and payment system update