Moving ThreadId to currentThreadId (static) and adding "threadId" with
attribute