Make critical components thread safe
Make critical components thread safe