Enhancement to use the common CryptoUtils