Added TODO work for SettingsManager