Refactoring other modules