Added the rest of modules