Added more modules