UserSettingsServiceRefactor