Adapting for new collections scheme