[DF-4232] Added ordered indexes into enumMap