Added a lot of classes in base