Refactoring the new module - Phase1