Encryption-Enhancements