Added a lot of new Classes