Implemented review comments to rename use_encryption option and add validation