Add client support for encrypting options