Added thread_id