Add thread safety todos