Added session support