Mostly add thread category/status management