Change callbacks to arity 2: (EventId, Data)