Adds Enumeration GameModeType in clean way

Hope to see only the related changes now in this pull request