[ClearSuite] Add more stuff