Adaptation to newest Collect Core