New classes and many changes in other classes