Adding some basic session support