Change model to be more state- and less event-focussed.