Changed API more, updated EVDS