Change 'grouped' to 'objects' in a few places to match config structure