Add 'dist' and 'group' as feature-flagged top-level keys