Optimised EventFactory a bit.