Improving CryptoModule implementation.