Update locking to use Threadsafe set