Added a few more modules