Added more modules to module category per #932