Rebuilt with sub collection updates