Add database session store options, refactor some code