Modified for session_store