Added support for settings