OCD
Better support for custom group models and remove events