diff --git a/docs/simplesamlphp-upgrade-notes-2.0.md b/docs/simplesamlphp-upgrade-notes-2.0.md
index 979d6d96ede499023d1a2d96bf95ec589ce672c2..332d5a1098b387830086a413c1fac5a7e4db3a93 100644
--- a/docs/simplesamlphp-upgrade-notes-2.0.md
+++ b/docs/simplesamlphp-upgrade-notes-2.0.md
@@ -15,18 +15,18 @@ Upgrade notes for SimpleSAMLphp 2.0
     to manually switch back the `sharedkey_algorithm`. Note that CBC is vulnerable to the Padding oracle attack.
 - In compliancy with SAML2INT, AuthnRequests that are signed will have their signature validated unless specifically disabled by setting `validate.authnrequest` to `false`.  If unset, or set to true, signatures will be validated and requests not passing validation will be refused.
 - The following classes have been migrated to non-static:
-  + lib/SimpleSAMLphp\Utils\Arrays
-  + lib/SimpleSAMLphp\Utils\Attributes
-  + lib/SimpleSAMLphp\Utils\Auth
-  + lib/SimpleSAMLphp\Utils\Config
-  + lib/SimpleSAMLphp\Utils\Crypto
-  + lib/SimpleSAMLphp\Utils\EMail
-  + lib/SimpleSAMLphp\Utils\HTTP
-  + lib/SimpleSAMLphp\Utils\Net
-  + lib/SimpleSAMLphp\Utils\Random
-  + lib/SimpleSAMLphp\Utils\System
-  + lib/SimpleSAMLphp\Utils\Time
-  + lib/SimpleSAMLphp\Utils\XML
+  + lib/SimpleSAML\Utils\Arrays
+  + lib/SimpleSAML\Utils\Attributes
+  + lib/SimpleSAML\Utils\Auth
+  + lib/SimpleSAML\Utils\Config
+  + lib/SimpleSAML\Utils\Crypto
+  + lib/SimpleSAML\Utils\EMail
+  + lib/SimpleSAML\Utils\HTTP
+  + lib/SimpleSAML\Utils\Net
+  + lib/SimpleSAML\Utils\Random
+  + lib/SimpleSAML\Utils\System
+  + lib/SimpleSAML\Utils\Time
+  + lib/SimpleSAML\Utils\XML
 
   If you use any of these classes in your modules or themes, you will now have to instantiate them so that:
 
@@ -38,3 +38,14 @@ Upgrade notes for SimpleSAMLphp 2.0
   // New style
   $arrayUtils = new \SimpleSAML\Utils\Arrays();
   $x = $arrayUtils->arrayize($someVar);
+
+- Database table schemes have been flattened. Upgrade paths are:
+  - Generic KVStore:  1.16+ > 2.0
+  - Logout store:     1.18+ > 2.0
+
+- Data stores have been refactored:
+  - lib/SimpleSAML/Store.php has been renamed to lib/SimpleSAML/Store/StoreFactory.php and is now solely a Factory-class
+  - All store implementations now implement \SimpleSAML\Store\StoreInterface:
+    - lib/SimpleSAML/Store/SQL.php has been renamed to lib/SimpleSAML/Store/SQLStore.php
+    - lib/SimpleSAML/Store/Memcache.php has been renamed to lib/SimpleSAML/Store/MemcacheStore.php
+    - lib/SimpleSAML/Store/Redis.php has been renamed to lib/SimpleSAML/Store/RedisStore.php
diff --git a/modules/saml/lib/SP/LogoutStore.php b/modules/saml/lib/SP/LogoutStore.php
index ef6f258e9fef51bf8250a01facbeb74a338c21fe..b021f2420cf06f69bd5186839fa77a19d584d046 100644
--- a/modules/saml/lib/SP/LogoutStore.php
+++ b/modules/saml/lib/SP/LogoutStore.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SimpleSAML\Module\saml\SP;
 
+use Exception;
 use PDO;
 use SAML2\XML\saml\NameID;
 use SimpleSAML\Assert\Assert;