Added specialised model for EnumValue