Added more modules and config