Added more modules (cont.)