diff --git a/typo3/sysext/beuser/Configuration/TypoScript/setup.txt b/typo3/sysext/beuser/Configuration/TypoScript/setup.txt
index 9c83d1ee8db533eb107ae4439fc66f0f9486afeb..6dfe2b79b1b7133ad1ccc7092a1da1f7ce66206b 100644
--- a/typo3/sysext/beuser/Configuration/TypoScript/setup.txt
+++ b/typo3/sysext/beuser/Configuration/TypoScript/setup.txt
@@ -1,29 +1,30 @@
-module.tx_beuser {
-	persistence {
-		storagePid = 0
-
-		classes {
-			TYPO3\CMS\Beuser\Domain\Model\BackendUser {
-				mapping {
-					tableName = be_users
-					columns {
-						allowed_languages.mapOnProperty = allowedLanguages
-						file_mountpoints.mapOnProperty = fileMountPoints
-						db_mountpoints.mapOnProperty = dbMountPoints
-						usergroup.mapOnProperty = backendUserGroups
-					}
-				}
+// Model/table mapping
+config.tx_extbase.persistence.classes {
+	TYPO3\CMS\Beuser\Domain\Model\BackendUser {
+		mapping {
+			tableName = be_users
+			columns {
+				allowed_languages.mapOnProperty = allowedLanguages
+				file_mountpoints.mapOnProperty = fileMountPoints
+				db_mountpoints.mapOnProperty = dbMountPoints
+				usergroup.mapOnProperty = backendUserGroups
 			}
-			TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup {
-				mapping {
-					tableName = be_groups
-					columns {
-						subgroup.mapOnProperty = subGroups
-					}
-				}
+		}
+	}
+	TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup {
+		mapping {
+			tableName = be_groups
+			columns {
+				subgroup.mapOnProperty = subGroups
 			}
 		}
 	}
+}
+
+module.tx_beuser {
+	persistence {
+		storagePid = 0
+	}
 
 	settings {
 			// This is a dummy entry. It is used in  Tx_Beuser_Controller_BackendUserController