Updated model on events by cat/tag to avoid confusion