Updated EVDS database to new functions format
Added support for re-ordering function variables