Moving to EMF 2.04