Added additional support for settings