Imporved the settings class