Adding encrypted bags support