Improvements and upgrades to CryptoManager