Added more modules and working on categories.