Adding a few more modules that have been missed in the past