Changed events to handle model instead of id (no more model id lookup)