Refactoring of the extractor to isolate authentication and introduce export of EventID