Updated mods and resolved id conflicts