Adding basic session support