Collection: Adapt to New Peak/Peak v2