Add Thread-Safety