Added more modules and a feature