Updating Collection usage pattern to use Collection.lookup