Encryption enhancements

2024