Added basic session support