Updates for threadpooling, etc.