MOD refactoring