Added a bunch of classes again