Improve EmergencyContact implementation