Updated classes and pricing