Update to new collection method