Moving to EMF v2.0