added session support