Changes EIA backend
merge conflicts