Added a couple of classes