EMF Refactor Core Component