Major update in "Crypto" classes