Extended EMF Refactor part