Collection Update

Initial checkin
Revert "Collection Update"

This reverts commit f3d41e20f78a4546f0f5633429837afd01a91b5f.
Misc Update