Added a few more modules and updated the scripts