Adapt to new Collage API