Edits to event model and filesystem