Refactor - Merge mods