Added Enumerator protocol/event name <-> ID bi-directional lookup