Changed HashMap to EnumMap