Added support for more presets