Add client side locking