Update to work with new collect interface.