Replace senderToken with a lock