Changed complicated Map<> with new enum class Factor