Work on UBI to add on-the-fly encryption