Updated TODO and added map comment to SettingCategory