Added generic support for Settings