Added support for ThreadStatic