Added some defaults for encryption