Improvements for settings