Add session support
0.2.8