Few changes on ModuleController