EA_MODEL Adaptations to make the model handle the change to enumeration