update to use updated encryption classes