Added TypeSetting review comments