Encounter potential logic problem
Create EditField enum class
Added in field and value in key constant class