Add presets; Refactor collection persistence