Make the class thread safe
Add note -- class should be thread-safe.