Added the rest of the Modules