Revert "Revert "Collection Update""

This reverts commit 26832b77bf1e1083a16dd4a0c071a4e01627df53.