Added a few classes to help compilation