Added a lot of classes