Refactoring to introduce new module