diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif
index 40ef709..9c6865a 100644
--- a/source4/setup/schema.ldif
+++ b/source4/setup/schema.ldif
@@ -8567,6 +8567,408 @@ schemaIDGUID: f30e3bc1-9ff0-11d1-b603-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
 
+dn: CN=Next-Level-Store,${SCHEMADN}
+lDAPDisplayName: nextLevelStore
+objectClass: top
+objectClass: attributeSchema
+attributeID: 1.2.840.113556.1.4.214
+attributeSyntax: 2.5.5.1
+oMSyntax: 127
+oMObjectClass:: KwwCh3McAIVK
+isSingleValued: TRUE
+schemaIDGUID: bf9679da-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Next-Level-Store
+adminDescription: Next-Level-Store
+
+dn: CN=Last-Update-Sequence,${SCHEMADN}
+lDAPDisplayName: lastUpdateSequence
+objectClass: top
+objectClass: attributeSchema
+attributeID: 1.2.840.113556.1.4.330
+attributeSyntax: 2.5.5.12
+oMSyntax: 64
+isSingleValued: TRUE
+schemaIDGUID: 7d6c0e9c-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Last-Update-Sequence
+adminDescription: Last-Update-Sequence
+
+dn: CN=App-Schema-Version,${SCHEMADN}
+lDAPDisplayName: appSchemaVersion
+objectClass: top
+objectClass: attributeSchema
+attributeID: 1.2.840.113556.1.4.848
+attributeSyntax: 2.5.5.9
+oMSyntax: 2
+isSingleValued: TRUE
+schemaIDGUID: 96a7dd65-9118-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: App-Schema-Version
+adminDescription: App-Schema-Version
+
+dn: CN=Version-Number-Lo,${SCHEMADN}
+ldapDisplayName: versionNumberLo
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.329
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIDGUID: 7d6c0e9b-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Version-Number-Lo
+adminDescription: Version-Number-Lo
+
+dn: CN=Version-Number-Hi,${SCHEMADN}
+ldapDisplayName: versionNumberHi
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.328
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIdGuid: 7d6c0e9a-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Version-Number-Hi
+adminDescription: Version-Number-Hi
+
+dn: CN=Vendor,${SCHEMADN}
+ldapDisplayName: vendor
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.255
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: TRUE
+schemaIdGuid: 281416df-1968-11d0-a28f-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 0
+rangeUpper: 512
+systemFlags: 16
+adminDisplayName: Vendor
+adminDescription: Vendor
+
+dn: CN=Upgrade-Product-Code,${SCHEMADN}
+ldapDisplayName: upgradeProductCode
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.813
+attributeSyntax: 2.5.5.10
+omSyntax: 4
+isSingleValued: FALSE
+schemaIdGuid: d9e18312-8939-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 0
+rangeUpper: 16
+systemFlags: 16
+adminDisplayName: Upgrade-Product-Code
+adminDescription: Upgrade-Product-Code
+
+dn: CN=Setup-Command,${SCHEMADN}
+ldapDisplayName: setupCommand
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.325
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: TRUE
+schemaIdGuid: 7d6c0e97-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+systemFlags: 16
+adminDisplayName: Setup-Command
+adminDescription: Setup-Command
+
+dn: CN=Product-Code,${SCHEMADN}
+ldapDisplayName: productCode
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.818
+attributeSyntax: 2.5.5.10
+omSyntax: 4
+isSingleValued: TRUE
+schemaIdGuid: d9e18317-8939-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 0
+rangeUpper: 16
+systemFlags: 16
+adminDisplayName: Product-Code
+adminDescription: Product-Code
+
+dn: CN=Package-Type,${SCHEMADN}
+ldapDisplayName: packageType
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.324
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIdGuid: 7d6c0e96-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Package-Type
+adminDescription: Package-Type
+
+dn: CN=Package-Name,${SCHEMADN}
+ldapDisplayName: packageName
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.326
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: TRUE
+schemaIdGuid: 7d6c0e98-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Package-Name
+adminDescription: Package-Name
+
+dn: CN=Package-Flags,${SCHEMADN}
+ldapDisplayName: packageFlags
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.327
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIdGuid: 7d6c0e99-7e20-11d0-afd6-00c04fd930c9
+systemOnly: FALSE
+searchFlags: 1
+systemFlags: 16
+adminDisplayName: Package-Flags
+adminDescription: Package-Flags
+
+dn: CN=Msi-Script-Size,${SCHEMADN}
+ldapDisplayName: msiScriptSize
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.846
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIdGuid: 96a7dd63-9118-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Msi-Script-Size
+adminDescription: Msi-Script-Size
+
+dn: CN=Msi-Script-Path,${SCHEMADN}
+ldapDisplayName: msiScriptPath
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.15
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: TRUE
+schemaIdGuid: bf967937-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Msi-Script-Path
+adminDescription: Msi-Script-Path
+
+dn: CN=Msi-Script-Name,${SCHEMADN}
+ldapDisplayName: msiScriptName
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.845
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: TRUE
+schemaIdGuid: 96a7dd62-9118-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Msi-Script-Name
+adminDescription: Msi-Script-Name
+
+dn: CN=Msi-Script,${SCHEMADN}
+ldapDisplayName: msiScript
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.814
+attributeSyntax: 2.5.5.10
+omSyntax: 4
+isSingleValued: TRUE
+schemaIdGuid: d9e18313-8939-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Msi-Script
+adminDescription: Msi-Script
+
+dn: CN=Msi-File-List,${SCHEMADN}
+ldapDisplayName: msiFileList
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.671
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: 7bfdcb7d-4807-11d1-a9c3-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Msi-File-List
+adminDescription: Msi-File-List
+
+dn: CN=Machine-Architecture,${SCHEMADN}
+ldapDisplayName: machineArchitecture
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.68
+attributeSyntax: 2.5.5.9
+omSyntax: 10
+isSingleValued: FALSE
+schemaIdGuid: bf9679af-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Machine-Architecture
+adminDescription: Machine-Architecture
+
+dn: CN=Install-Ui-Level,${SCHEMADN}
+ldapDisplayName: installUiLevel
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.847
+attributeSyntax: 2.5.5.9
+omSyntax: 2
+isSingleValued: TRUE
+schemaIdGuid: 96a7dd64-9118-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Install-Ui-Level
+adminDescription: Install-Ui-Level
+
+dn: CN=File-Ext-Priority,${SCHEMADN}
+ldapDisplayName: fileExtPriority
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.816
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: d9e18315-8939-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 1
+systemFlags: 16
+adminDisplayName: File-Ext-Priority
+adminDescription: File-Ext-Priority
+
+dn: CN=COM-Typelib-Id,${SCHEMADN}
+ldapDisplayName: cOMTypelibId
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.254
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: 281416de-1968-11d0-a28f-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 36
+rangeUpper: 36
+systemFlags: 16
+adminDisplayName: COM-Typelib-Id
+adminDescription: COM-Typelib-Id
+
+dn: CN=COM-ProgID,${SCHEMADN}
+ldapDisplayName: cOMProgID
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.21
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: bf96793d-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: COM-ProgID
+adminDescription: COM-ProgID
+
+dn: CN=COM-InterfaceID,${SCHEMADN}
+ldapDisplayName: cOMInterfaceID
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.20
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: bf96793c-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 36
+rangeUpper: 36
+systemFlags: 16
+adminDisplayName: COM-InterfaceID
+adminDescription: COM-InterfaceID
+
+dn: CN=COM-ClassID,${SCHEMADN}
+ldapDisplayName: cOMClassID
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.19
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: bf96793b-0de6-11d0-a285-00aa003049e2
+systemOnly: FALSE
+searchFlags: 1
+systemFlags: 16
+adminDisplayName: COM-ClassID
+adminDescription: COM-ClassID
+
+dn: CN=Categories,${SCHEMADN}
+ldapDisplayName: categories
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.672
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: 7bfdcb7e-4807-11d1-a9c3-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+rangeLower: 36
+rangeUpper: 36
+systemFlags: 16
+adminDisplayName: Categories
+adminDescription: Categories
+
+dn: CN=Can-Upgrade-Script,${SCHEMADN}
+ldapDisplayName: canUpgradeScript
+objectClass: top
+objectClass: attributeSchema
+attributeId: 1.2.840.113556.1.4.815
+attributeSyntax: 2.5.5.12
+omSyntax: 64
+isSingleValued: FALSE
+schemaIdGuid: d9e18314-8939-11d1-aebc-0000f80367c1
+systemOnly: FALSE
+searchFlags: 0
+systemFlags: 16
+adminDisplayName: Can-Upgrade-Script
+adminDescription: Can-Upgrade-Script
+
 dn: CN=Top,${SCHEMADN}
 objectClass: top
 objectClass: classSchema
@@ -10373,6 +10775,83 @@ systemFlags: 16
 defaultHidingValue: TRUE
 defaultObjectCategory: CN=Group-Policy-Container,${SCHEMADN}
 
+dn: CN=Class-Store,${SCHEMADN}
+lDAPDisplayName: classStore
+objectClass: top
+objectClass: classSchema
+governsID: 1.2.840.113556.1.5.44
+objectClassCategory: 1
+rDNAttID: cn
+subClassOf: top
+systemMayContain: versionNumber
+systemMayContain: nextLevelStore
+systemMayContain: lastUpdateSequence
+systemMayContain: appSchemaVersion
+systemPossSuperiors: domainPolicy
+systemPossSuperiors: computer
+systemPossSuperiors: group
+systemPossSuperiors: user
+systemPossSuperiors: classStore
+systemPossSuperiors: organizationalUnit
+systemPossSuperiors: domainDNS
+systemPossSuperiors: container
+schemaIDGUID: bf967a84-0de6-11d0-a285-00aa003049e2
+defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)
+ (A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)
+defaultHidingValue: TRUE
+systemOnly: FALSE
+defaultObjectCategory: CN=Class-Store,${SCHEMADN}
+systemFlags: 16
+adminDisplayName: Class-Store
+adminDescription: Class-Store
+
+dn: CN=Package-Registration,${SCHEMADN}
+lDAPDisplayName: packageRegistration
+objectClass: top
+objectClass: classSchema
+governsID: 1.2.840.113556.1.5.49
+objectClassCategory: 1
+rDNAttID: cn
+subClassOf: top
+systemMayContain: versionNumberLo
+systemMayContain: versionNumberHi
+systemMayContain: vendor
+systemMayContain: upgradeProductCode
+systemMayContain: setupCommand
+systemMayContain: productCode
+systemMayContain: packageType
+systemMayContain: packageName
+systemMayContain: packageFlags
+systemMayContain: msiScriptSize
+systemMayContain: msiScriptPath
+systemMayContain: msiScriptName
+systemMayContain: msiScript
+systemMayContain: msiFileList
+systemMayContain: managedBy
+systemMayContain: machineArchitecture
+systemMayContain: localeID
+systemMayContain: lastUpdateSequence
+systemMayContain: installUiLevel
+systemMayContain: iconPath
+systemMayContain: fileExtPriority
+systemMayContain: cOMTypelibId
+systemMayContain: cOMProgID
+systemMayContain: cOMInterfaceID
+systemMayContain: cOMClassID
+systemMayContain: categories
+systemMayContain: canUpgradeScript
+systemPossSuperiors: classStore
+schemaIDGUID: bf967aa6-0de6-11d0-a285-00aa003049e2
+defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)
+ (A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)
+defaultHidingValue: TRUE
+systemOnly: FALSE
+defaultObjectCategory: CN=Package-Registration,${SCHEMADN}
+systemFlags: 16
+adminDisplayName: Package-Registration
+adminDescription: Package-Registration
+
 dn: CN=Aggregate,${SCHEMADN}
 objectClass: top
 objectClass: subSchema
+