EA_MODEL small enhancements without change in functionality