Rework for settings