Improve session store, can be split with