Added a few classes from other projects