Update with correct thread safety information