Improved Thread Safety