Adapt to Collage API change