Changed the settings framework