Use of EnumMaps instead of HashMaps for enums.
Merge pull request #730 from Shredder121/EnumMaps

Use of EnumMaps instead of HashMaps for enums.