Update for encryption support