Removed EGF, added ecore