update hooks and management for grouping