Refactoring to Collections launch update