Added some additional classes and config files