Added more modules and files