added eid handler