Change cherly's version
Support thread-safe