Update to latest collection changes