Add badgeId field to SettingsStore