Better suport for multithreading environment.