Added EventFactory code