Add multi encryption key support