Moving to EMF 1.1