improve Session API