Rework for handling settings