Added some classes that we're going to need