Add lock for thread safe