Add all game types
Merge with conflicts resolved