Update to work with current eve-val