Added a bunch of classes