Added a couple more modules