Added a couple classes