Feature/enhanced nonce