Change how events are stored
Merge branch 'event_model'