Settings refactored