Mods refactoring