Removed event factory - updating the model.