EYS compatibility changes