Enhancements for settings