Refactoring for additional presets