Added 2 more modules