updates to support for encryption