Refactored some of the modules