MOD: reconstruct EventFactory