Added custom EMF support