Added support for settings API