SI: Deleted unused parameter.
Model: Added EventStorage prototype.
SI: Using EventStorage.