Improved thread safety?