Improved settings class