Add multi encryption key support

Strike that, wrong method. I see the null check below!