Improve session store