Major update, pre-optimizing collections