Improve Encryption module.