[*] Upgrade Team Mod with generics functions