Working on EVS compatibility
Changes for EVS