New emf model better support