Update locking, add sleuth