Discovery supports multiple games
Fix up multi-game support