Added session support into the client