Refactor UserPreferencesSubscriber