Added a few new modules