Update to support session keys