diff --git a/lib/classes/base.php b/lib/classes/base.php
index d1982bb4c7..0929ce26a0 100644
--- a/lib/classes/base.php
+++ b/lib/classes/base.php
@@ -263,8 +263,19 @@ abstract class base implements cache_cacheableInterface
$ORMTables = array(
'AuthFailures',
+ 'AggregateTokens',
'BasketElements',
'Baskets',
+ 'FeedEntries',
+ 'FeedItems',
+ 'FeedPublishers',
+ 'FeedTokens',
+ 'Feeds',
+ 'FtpCredential',
+ 'FtpExportElements',
+ 'FtpExports',
+ 'OrderElements',
+ 'Orders',
'StoryWZ',
'UsrListOwners',
'UsrLists',
@@ -279,6 +290,10 @@ abstract class base implements cache_cacheableInterface
'SessionModules',
'Sessions',
'UsrAuthProviders',
+ 'UserQueries',
+ 'UserSettings',
+ 'Users',
+ 'UserNotificationSettings',
);
foreach ($rs as $row) {
diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml
index 081c03b795..f3ac1ec56e 100644
--- a/lib/conf.d/bases_structure.xml
+++ b/lib/conf.d/bases_structure.xml
@@ -1993,157 +1993,6 @@