Adding event source to model computed change, reversing event order to trigger specific before generic.