Make session shim