Updated XSD files

[GitHub/WoltLab/WCF.git] / com.woltlab.wcf / objectType.xml

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index dc9c8000aa3bda5f59edce1ffd088ee4af2ce748..20bf321505c87feb383eea78628d5f69bdfe7c43 100644 (file)
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1,161 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/objectType.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/vortex/objectType.xsd">
        <import>
                <!-- clipboard items -->
                <type>
                        <name>com.woltlab.wcf.user</name>
                        <definitionname>com.woltlab.wcf.clipboardItem</definitionname>
-                       <listclassname><![CDATA[wcf\data\user\UserList]]></listclassname>
+                       <listclassname>wcf\data\user\UserList</listclassname>
                </type>
                <type>
                        <name>com.woltlab.wcf.tag</name>
                        <definitionname>com.woltlab.wcf.clipboardItem</definitionname>
-                       <listclassname><![CDATA[wcf\data\tag\TagList]]></listclassname>
+                       <listclassname>wcf\data\tag\TagList</listclassname>
                </type>
-               <!-- /clipboard items -->
-               
                <type>
-                       <name>com.woltlab.wcf.collapsibleSidebar</name>
-                       <definitionname>com.woltlab.wcf.collapsibleContent</definitionname>
+                       <name>com.woltlab.wcf.media</name>
+                       <definitionname>com.woltlab.wcf.clipboardItem</definitionname>
+                       <listclassname>wcf\data\media\ViewableMediaList</listclassname>
                </type>
+               <!-- /clipboard items -->
                
+               <!-- articles -->
                <type>
-                       <name>com.woltlab.wcf.bbcode.smiley</name>
+                       <name>com.woltlab.wcf.article.category</name>
                        <definitionname>com.woltlab.wcf.category</definitionname>
-                       <classname><![CDATA[wcf\system\category\SmileyCategoryType]]></classname>
-               </type>
-               
-               <type>
-                       <name>com.woltlab.wcf.user.follow</name>
-                       <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
-                       <classname><![CDATA[wcf\system\user\notification\object\type\UserFollowUserNotificationObjectType]]></classname>
-                       <category>com.woltlab.wcf.user</category>
-               </type>
-               
-               <type>
-                       <name>com.woltlab.wcf.user.recentActivityEvent.follow</name>
-                       <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
-                       <classname><![CDATA[wcf\system\user\activity\event\FollowUserActivityEvent]]></classname>
+                       <classname>wcf\system\category\ArticleCategoryType</classname>
                </type>
-               
                <type>
-                       <name>com.woltlab.wcf.user.DashboardPage</name>
-                       <definitionname>com.woltlab.wcf.user.dashboardContainer</definitionname>
-                       <allowcontent>1</allowcontent>
-                       <allowsidebar>1</allowsidebar>
+                       <name>com.woltlab.wcf.article.category</name>
+                       <definitionname>com.woltlab.wcf.acl</definitionname>
                </type>
-               
                <type>
-                       <name>com.woltlab.wcf.user.MembersListPage</name>
-                       <definitionname>com.woltlab.wcf.user.dashboardContainer</definitionname>
-                       <allowcontent>0</allowcontent>
-                       <allowsidebar>1</allowsidebar>
+                       <name>com.woltlab.wcf.article</name>
+                       <definitionname>com.woltlab.wcf.tagging.taggableObject</definitionname>
+                       <classname>wcf\system\tagging\TaggableArticle</classname>
                </type>
-               
                <type>
-                       <name>com.woltlab.wcf.user</name>
-                       <definitionname>com.woltlab.wcf.moderation.report</definitionname>
-                       <classname>wcf\system\moderation\queue\report\UserModerationQueueReportHandler</classname>
-               </type>
-               
-               <!-- user online locations -->
-               <type>
-                       <name>com.woltlab.wcf.user.UserPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <classname><![CDATA[wcf\system\user\online\location\UserLocation]]></classname>
-                       <controller><![CDATA[wcf\page\UserPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.UserPage</languagevariable>
+                       <name>com.woltlab.wcf.likeableArticle</name>
+                       <definitionname>com.woltlab.wcf.like.likeableObject</definitionname>
+                       <classname>wcf\data\article\LikeableArticleProvider</classname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.UsersOnlineListPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\page\UsersOnlineListPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.UsersOnlineListPage</languagevariable>
+                       <name>com.woltlab.wcf.likeableArticle.recentActivityEvent</name>
+                       <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
+                       <classname>wcf\system\user\activity\event\LikeableArticleUserActivityEvent</classname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.MembersListPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\page\MembersListPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.MembersListPage</languagevariable>
+                       <name>com.woltlab.wcf.articleComment.recentActivityEvent</name>
+                       <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
+                       <classname>wcf\system\user\activity\event\ArticleCommentUserActivityEvent</classname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.TeamPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\page\TeamPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.TeamPage</languagevariable>
+                       <name>com.woltlab.wcf.articleComment.response.recentActivityEvent</name>
+                       <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
+                       <classname>wcf\system\user\activity\event\ArticleCommentResponseUserActivityEvent</classname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.DashboardPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\page\DashboardPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.DashboardPage</languagevariable>
+                       <name>com.woltlab.wcf.article</name>
+                       <definitionname>com.woltlab.wcf.searchableObjectType</definitionname>
+                       <classname>wcf\system\search\ArticleSearch</classname>
+                       <searchindex>wcf1_article_search_index</searchindex>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.RecentActivityListPage</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\page\RecentActivityListPage]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.RecentActivityListPage</languagevariable>
+                       <name>com.woltlab.wcf.article.content</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
+               <!-- /articles -->
                
                <type>
-                       <name>com.woltlab.wcf.user.RegisterForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\RegisterForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.RegisterForm</languagevariable>
+                       <name>com.woltlab.wcf.page.content</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.LostPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\LostPasswordForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.LostPasswordForm</languagevariable>
+                       <name>com.woltlab.wcf.box.content</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.NewPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\NewPasswordForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.LostPasswordForm</languagevariable>
+                       <name>com.woltlab.wcf.user.aboutMe</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
                <type>
-                       <name>com.woltlab.wcf.user.LoginForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\LoginForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.LoginForm</languagevariable>
+                       <name>com.woltlab.wcf.user.signature</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
+               
                <type>
-                       <name>com.woltlab.wcf.user.AccountManagementForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\AccountManagementForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.AccountManagementForm</languagevariable>
+                       <name>com.woltlab.wcf.bbcode.smiley</name>
+                       <definitionname>com.woltlab.wcf.category</definitionname>
+                       <classname>wcf\system\category\SmileyCategoryType</classname>
                </type>
+               
                <type>
-                       <name>com.woltlab.wcf.user.AvatarEditForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\AvatarEditForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.AvatarEditForm</languagevariable>
+                       <name>com.woltlab.wcf.user.follow</name>
+                       <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
+                       <classname>wcf\system\user\notification\object\type\UserFollowUserNotificationObjectType</classname>
+                       <category>com.woltlab.wcf.user</category>
                </type>
+               
                <type>
-                       <name>com.woltlab.wcf.user.SettingsForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\SettingsForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.SettingsForm</languagevariable>
+                       <name>com.woltlab.wcf.user.recentActivityEvent.follow</name>
+                       <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
+                       <classname>wcf\system\user\activity\event\FollowUserActivityEvent</classname>
                </type>
+               
                <type>
-                       <name>com.woltlab.wcf.user.SignatureEditForm</name>
-                       <definitionname>com.woltlab.wcf.user.online.location</definitionname>
-                       <controller><![CDATA[wcf\form\SignatureEditForm]]></controller>
-                       <languagevariable>wcf.user.usersOnline.location.SignatureEditForm</languagevariable>
+                       <name>com.woltlab.wcf.user</name>
+                       <definitionname>com.woltlab.wcf.moderation.report</definitionname>
+                       <classname>wcf\system\moderation\queue\report\UserModerationQueueReportHandler</classname>
                </type>
                
                <!-- moderation type -->
                <type>
                        <name>com.woltlab.wcf.moderation.activation</name>
                        <definitionname>com.woltlab.wcf.moderation.type</definitionname>
-                       <classname><![CDATA[wcf\system\moderation\queue\ModerationQueueActivationManager]]></classname>
+                       <classname>wcf\system\moderation\queue\ModerationQueueActivationManager</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.moderation.report</name>
                        <definitionname>com.woltlab.wcf.moderation.type</definitionname>
-                       <classname><![CDATA[wcf\system\moderation\queue\ModerationQueueReportManager]]></classname>
+                       <classname>wcf\system\moderation\queue\ModerationQueueReportManager</classname>
                </type>
                <!-- /moderation type -->
                
@@ -178,63 +140,87 @@
                <type>
                        <name>com.woltlab.wcf.user.profileComment</name>
                        <definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
-                       <classname><![CDATA[wcf\system\comment\manager\UserProfileCommentManager]]></classname>
+                       <classname>wcf\system\comment\manager\UserProfileCommentManager</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.comment</name>
                        <definitionname>com.woltlab.wcf.like.likeableObject</definitionname>
-                       <classname><![CDATA[wcf\data\comment\LikeableCommentProvider]]></classname>
+                       <classname>wcf\data\comment\LikeableCommentProvider</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.comment.response</name>
                        <definitionname>com.woltlab.wcf.like.likeableObject</definitionname>
-                       <classname><![CDATA[wcf\data\comment\response\LikeableCommentResponseProvider]]></classname>
+                       <classname>wcf\data\comment\response\LikeableCommentResponseProvider</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.profileComment.recentActivityEvent</name>
                        <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
-                       <classname><![CDATA[wcf\system\user\activity\event\ProfileCommentUserActivityEvent]]></classname>
+                       <classname>wcf\system\user\activity\event\ProfileCommentUserActivityEvent</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.profileComment.response.recentActivityEvent</name>
                        <definitionname>com.woltlab.wcf.user.recentActivityEvent</definitionname>
-                       <classname><![CDATA[wcf\system\user\activity\event\ProfileCommentResponseUserActivityEvent]]></classname>
+                       <classname>wcf\system\user\activity\event\ProfileCommentResponseUserActivityEvent</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.profileComment.notification</name>
                        <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
-                       <classname><![CDATA[wcf\system\user\notification\object\type\UserProfileCommentUserNotificationObjectType]]></classname>
+                       <classname>wcf\system\user\notification\object\type\UserProfileCommentUserNotificationObjectType</classname>
                        <category>com.woltlab.wcf.user</category>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.profileComment.response.notification</name>
                        <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
-                       <classname><![CDATA[wcf\system\user\notification\object\type\UserProfileCommentResponseUserNotificationObjectType]]></classname>
+                       <classname>wcf\system\user\notification\object\type\UserProfileCommentResponseUserNotificationObjectType</classname>
                        <category>com.woltlab.wcf.user</category>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.profileComment.like.notification</name>
                        <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
-                       <classname><![CDATA[wcf\system\user\notification\object\type\LikeUserNotificationObjectType]]></classname>
+                       <classname>wcf\system\user\notification\object\type\LikeUserNotificationObjectType</classname>
                        <category>com.woltlab.wcf.user</category>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.profileComment.response.like.notification</name>
                        <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
-                       <classname><![CDATA[wcf\system\user\notification\object\type\LikeUserNotificationObjectType]]></classname>
+                       <classname>wcf\system\user\notification\object\type\LikeUserNotificationObjectType</classname>
                        <category>com.woltlab.wcf.user</category>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.moderation.queue</name>
                        <definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
-                       <classname><![CDATA[wcf\system\comment\manager\ModerationQueueCommentManager]]></classname>
+                       <classname>wcf\system\comment\manager\ModerationQueueCommentManager</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.moderation.queue.notification</name>
+                       <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
+                       <classname>wcf\system\user\notification\object\type\ModerationQueueCommentUserNotificationObjectType</classname>
+                       <category>com.woltlab.wcf.moderation</category>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.moderation.queue.response.notification</name>
+                       <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
+                       <classname>wcf\system\user\notification\object\type\ModerationQueueCommentResponseUserNotificationObjectType</classname>
+                       <category>com.woltlab.wcf.moderation</category>
+               </type>
+               
+               <type>
+                       <name>com.woltlab.wcf.page</name>
+                       <definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
+                       <classname>wcf\system\comment\manager\PageCommentManager</classname>
+               </type>
+               
+               <type>
+                       <name>com.woltlab.wcf.articleComment</name>
+                       <definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
+                       <classname>wcf\system\comment\manager\ArticleCommentManager</classname>
                </type>
                <!-- /comments -->
                
@@ -242,13 +228,13 @@
                <type>
                        <name>com.woltlab.wcf.comment.comment</name>
                        <definitionname>com.woltlab.wcf.moderation.report</definitionname>
-                       <classname><![CDATA[wcf\system\moderation\queue\report\CommentCommentModerationQueueReportHandler]]></classname>
+                       <classname>wcf\system\moderation\queue\report\CommentCommentModerationQueueReportHandler</classname>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.comment.response</name>
                        <definitionname>com.woltlab.wcf.moderation.report</definitionname>
-                       <classname><![CDATA[wcf\system\moderation\queue\report\CommentResponseModerationQueueReportHandler]]></classname>
+                       <classname>wcf\system\moderation\queue\report\CommentResponseModerationQueueReportHandler</classname>
                </type>
                <!-- /moderation -->
                
@@ -261,62 +247,87 @@
                <type>
                        <name>com.woltlab.wcf.user</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserImporter]]></classname>
+                       <classname>wcf\system\importer\UserImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.group</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserGroupImporter]]></classname>
+                       <classname>wcf\system\importer\UserGroupImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.option</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserOptionImporter]]></classname>
+                       <classname>wcf\system\importer\UserOptionImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.avatar</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserAvatarImporter]]></classname>
+                       <classname>wcf\system\importer\UserAvatarImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.comment</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserCommentImporter]]></classname>
+                       <classname>wcf\system\importer\UserCommentImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.comment.response</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserCommentResponseImporter]]></classname>
+                       <classname>wcf\system\importer\UserCommentResponseImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.follower</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserFollowerImporter]]></classname>
+                       <classname>wcf\system\importer\UserFollowerImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.rank</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\UserRankImporter]]></classname>
+                       <classname>wcf\system\importer\UserRankImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.label.group</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\LabelGroupImporter]]></classname>
+                       <classname>wcf\system\importer\LabelGroupImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.label</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\LabelImporter]]></classname>
+                       <classname>wcf\system\importer\LabelImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.smiley</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\SmileyImporter]]></classname>
+                       <classname>wcf\system\importer\SmileyImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.smiley.category</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\SmileyCategoryImporter]]></classname>
+                       <classname>wcf\system\importer\SmileyCategoryImporter</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.article.category</name>
+                       <definitionname>com.woltlab.wcf.importer</definitionname>
+                       <classname>wcf\system\importer\ArticleCategoryImporter</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.article</name>
+                       <definitionname>com.woltlab.wcf.importer</definitionname>
+                       <classname>wcf\system\importer\ArticleImporter</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.media</name>
+                       <definitionname>com.woltlab.wcf.importer</definitionname>
+                       <classname>wcf\system\importer\MediaImporter</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.article.comment</name>
+                       <definitionname>com.woltlab.wcf.importer</definitionname>
+                       <classname>wcf\system\importer\ArticleCommentImporter</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.article.comment.response</name>
+                       <definitionname>com.woltlab.wcf.importer</definitionname>
+                       <classname>wcf\system\importer\ArticleCommentResponseImporter</classname>
                </type>
                <!-- /importers -->
                
@@ -324,31 +335,43 @@
                <type>
                        <name>com.woltlab.wcf.like</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\LikeRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\LikeRebuildDataWorker</classname>
                        <nicevalue>-100</nicevalue>
                </type>
                <type>
                        <name>com.woltlab.wcf.like.user</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\LikeUserRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\LikeUserRebuildDataWorker</classname>
                        <nicevalue>-90</nicevalue>
                </type>
+               <type>
+                       <name>com.woltlab.wcf.article</name>
+                       <definitionname>com.woltlab.wcf.rebuildData</definitionname>
+                       <classname>wcf\system\worker\ArticleRebuildDataWorker</classname>
+                       <nicevalue>50</nicevalue>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.poll</name>
+                       <definitionname>com.woltlab.wcf.rebuildData</definitionname>
+                       <classname>wcf\system\worker\PollRebuildDataWorker</classname>
+                       <nicevalue>60</nicevalue>
+               </type>
                <type>
                        <name>com.woltlab.wcf.user</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\UserRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\UserRebuildDataWorker</classname>
                        <nicevalue>70</nicevalue>
                </type>
                <type>
                        <name>com.woltlab.wcf.attachment</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\AttachmentRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\AttachmentRebuildDataWorker</classname>
                        <nicevalue>100</nicevalue>
                </type>
                <type>
                        <name>com.woltlab.wcf.statDaily</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\StatDailyRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\StatDailyRebuildDataWorker</classname>
                        <nicevalue>110</nicevalue>
                </type>
                <!-- /rebuild data workers -->
@@ -357,38 +380,38 @@
                <type>
                        <name>com.woltlab.wcf.user</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\UserStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\UserStatDailyHandler</classname>
                        <default>1</default>
                        <categoryname>com.woltlab.wcf.general</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.attachment</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\AttachmentStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\AttachmentStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.general</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.attachment.diskUsage</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\AttachmentDiskUsageStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\AttachmentDiskUsageStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.general</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.like</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\LikeStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\LikeStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.user</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.dislike</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\DislikeStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\DislikeStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.user</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.userProfileComment</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\UserProfileCommentStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\UserProfileCommentStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.user</categoryname>
                </type>
                <!-- /stat handlers -->
@@ -397,55 +420,55 @@
                <type>
                        <name>com.woltlab.wcf.username</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+                       <classname>wcf\system\condition\UserUsernameCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.email</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+                       <classname>wcf\system\condition\UserEmailCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.userGroup</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+                       <classname>wcf\system\condition\UserGroupCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.languages</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+                       <classname>wcf\system\condition\UserLanguageCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDate</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDateInterval</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.avatar</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+                       <classname>wcf\system\condition\UserAvatarCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.state</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+                       <classname>wcf\system\condition\UserStateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.activityPoints</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>activityPoints</propertyname>
                        <minvalue>0</minvalue>
@@ -453,7 +476,7 @@
                <type>
                        <name>com.woltlab.wcf.likesReceived</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
@@ -461,265 +484,50 @@
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+                       <classname>wcf\system\condition\UserOptionsCondition</classname>
                        <conditiongroup>userOptions</conditiongroup>
                </type>
                <!-- /user group assignment conditions -->
                
-               <!-- pages -->
-               <type>
-                       <name>com.woltlab.wcf.AccountManagementForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\AccountManagementForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.AvatarEditForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\AvatarEditForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.DisclaimerForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\DisclaimerForm]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.EmailActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\EmailActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.EmailNewActivationCodeForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\EmailNewActivationCodeForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.LoginForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\LoginForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.LostPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\LostPasswordForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.MailForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\MailForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\ModerationActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationReportForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\ModerationReportForm]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NewPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\NewPasswordForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NotificationSettingsForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\NotificationSettingsForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterNewActivationCodeForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterNewActivationCodeForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SearchForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SearchForm]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SettingsForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SettingsForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SignatureEditForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SignatureEditForm]]></classname>
-                       <options>module_user_signature</options>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UserSearchForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\UserSearchForm]]></classname>
-                       <options>module_members_list</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.DashboardPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\DashboardPage]]></classname>
-                       <options>module_dashboard_page</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.DeletedContentListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\DeletedContentListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.FollowingPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\FollowingPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.IgnoredUsersPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\IgnoredUsersPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.MembersListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\MembersListPage]]></classname>
-                       <options>module_members_list</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\ModerationListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NotificationListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\NotificationListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.PrivacyPolicyPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\PrivacyPolicyPage]]></classname>
-                       <options>module_privacy_policy_page</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.PaidSubscriptionListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\PaidSubscriptionListPage]]></classname>
-                       <options>module_paid_subscription</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RecentActivityListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\RecentActivityListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SearchResultPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\SearchResultPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.TaggedPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\TaggedPage]]></classname>
-                       <options>module_tagging</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.TeamPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\TeamPage]]></classname>
-                       <options>module_team_page</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UserPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\UserPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UsersOnlineListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\UsersOnlineListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <!-- /pages -->
-               
                <!-- notice conditions -->
                <type>
-                       <name>com.woltlab.wcf.page.controller</name>
+                       <name>com.woltlab.wcf.page</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\MultiPageControllerCondition]]></classname>
+                       <classname>wcf\system\condition\page\MultiPageCondition</classname>
                        <conditionobject>com.woltlab.wcf.page</conditionobject>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.pointInTime.daysOfWeek</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\DaysOfWeekCondition]]></classname>
+                       <classname>wcf\system\condition\DaysOfWeekCondition</classname>
                        <conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
                </type>
                <type>
                        <name>com.woltlab.wcf.pointInTime.time</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\TimeCondition]]></classname>
+                       <classname>wcf\system\condition\TimeCondition</classname>
                        <conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.username</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+                       <classname>wcf\system\condition\UserUsernameCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.email</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+                       <classname>wcf\system\condition\UserEmailCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.userGroup</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+                       <classname>wcf\system\condition\UserGroupCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                        <includeguests>1</includeguests>
@@ -727,42 +535,42 @@
                <type>
                        <name>com.woltlab.wcf.user.languages</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+                       <classname>wcf\system\condition\UserLanguageCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.registrationDate</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.registrationDateInterval</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.avatar</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+                       <classname>wcf\system\condition\UserAvatarCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.state</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+                       <classname>wcf\system\condition\UserStateCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.mobileBrowser</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserMobileBrowserCondition]]></classname>
+                       <classname>wcf\system\condition\UserMobileBrowserCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
@@ -770,14 +578,14 @@
                <type>
                        <name>com.woltlab.wcf.user.birthday</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserBirthdayCondition]]></classname>
+                       <classname>wcf\system\condition\UserBirthdayCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.activityPoints</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>activityPoints</propertyname>
@@ -786,7 +594,7 @@
                <type>
                        <name>com.woltlab.wcf.user.likesReceived</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>likesReceived</propertyname>
@@ -795,7 +603,7 @@
                <type>
                        <name>com.woltlab.wcf.user.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+                       <classname>wcf\system\condition\UserOptionsCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>userOptions</conditiongroup>
                </type>
@@ -842,43 +650,43 @@
                
                <!-- ad conditions -->
                <type>
-                       <name>com.woltlab.wcf.page.controller</name>
+                       <name>com.woltlab.wcf.page</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\MultiPageControllerCondition]]></classname>
+                       <classname>wcf\system\condition\page\MultiPageCondition</classname>
                        <conditionobject>com.woltlab.wcf.page</conditionobject>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.pointInTime.daysOfWeek</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\DaysOfWeekCondition]]></classname>
+                       <classname>wcf\system\condition\DaysOfWeekCondition</classname>
                        <conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
                </type>
                <type>
                        <name>com.woltlab.wcf.pointInTime.time</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\TimeCondition]]></classname>
+                       <classname>wcf\system\condition\TimeCondition</classname>
                        <conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
                </type>
                
                <type>
                        <name>com.woltlab.wcf.user.username</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+                       <classname>wcf\system\condition\UserUsernameCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.email</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+                       <classname>wcf\system\condition\UserEmailCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.userGroup</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+                       <classname>wcf\system\condition\UserGroupCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                        <includeguests>1</includeguests>
@@ -886,42 +694,42 @@
                <type>
                        <name>com.woltlab.wcf.user.languages</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+                       <classname>wcf\system\condition\UserLanguageCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.registrationDate</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.registrationDateInterval</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.avatar</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+                       <classname>wcf\system\condition\UserAvatarCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.state</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+                       <classname>wcf\system\condition\UserStateCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.user.mobileBrowser</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserMobileBrowserCondition]]></classname>
+                       <classname>wcf\system\condition\UserMobileBrowserCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>general</conditiongroup>
                </type>
@@ -929,7 +737,7 @@
                <type>
                        <name>com.woltlab.wcf.user.activityPoints</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>activityPoints</propertyname>
@@ -938,7 +746,7 @@
                <type>
                        <name>com.woltlab.wcf.user.likesReceived</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>likesReceived</propertyname>
@@ -947,7 +755,7 @@
                <type>
                        <name>com.woltlab.wcf.user.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+                       <classname>wcf\system\condition\UserOptionsCondition</classname>
                        <conditionobject>com.woltlab.wcf.user</conditionobject>
                        <conditiongroup>userOptions</conditiongroup>
                </type>
@@ -957,12 +765,12 @@
                <type>
                        <name>com.woltlab.wcf.recaptcha</name>
                        <definitionname>com.woltlab.wcf.captcha</definitionname>
-                       <classname><![CDATA[wcf\system\captcha\RecaptchaHandler]]></classname>
+                       <classname>wcf\system\captcha\RecaptchaHandler</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.captchaQuestion</name>
                        <definitionname>com.woltlab.wcf.captcha</definitionname>
-                       <classname><![CDATA[wcf\system\captcha\CaptchaQuestionHandler]]></classname>
+                       <classname>wcf\system\captcha\CaptchaQuestionHandler</classname>
                </type>
                <!-- captcha types -->
                
@@ -970,38 +778,47 @@
                <type>
                        <name>com.woltlab.wcf.quote</name>
                        <definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
-                       <classname><![CDATA[wcf\system\message\embedded\object\QuoteMessageEmbeddedObjectHandler]]></classname>
+                       <classname>wcf\system\message\embedded\object\QuoteMessageEmbeddedObjectHandler</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.attachment</name>
                        <definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
-                       <classname><![CDATA[wcf\system\message\embedded\object\AttachmentMessageEmbeddedObjectHandler]]></classname>
+                       <classname>wcf\system\message\embedded\object\AttachmentMessageEmbeddedObjectHandler</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.page</name>
+                       <definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+                       <classname>wcf\system\message\embedded\object\PageMessageEmbeddedObjectHandler</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.media</name>
+                       <definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+                       <classname>wcf\system\message\embedded\object\MediaMessageEmbeddedObjectHandler</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.user</name>
+                       <definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+                       <classname>wcf\system\message\embedded\object\UserMessageEmbeddedObjectHandler</classname>
                </type>
                <!-- embedded object handlers -->
                
                <type>
                        <name>com.woltlab.wcf.payment.method.paypal</name>
                        <definitionname>com.woltlab.wcf.payment.method</definitionname>
-                       <classname><![CDATA[wcf\system\payment\method\PaypalPaymentMethod]]></classname>
+                       <classname>wcf\system\payment\method\PaypalPaymentMethod</classname>
                </type>
                
-               <!-- <type>
-                       <name>com.woltlab.wcf.payment.method.sofortUeberweisung</name>
-                       <definitionname>com.woltlab.wcf.payment.method</definitionname>
-                       <classname><![CDATA[wcf\system\payment\method\SofortUeberweisungPaymentMethod]]></classname>
-               </type>-->
-               
                <type>
                        <name>com.woltlab.wcf.payment.type.paidSubscription</name>
                        <definitionname>com.woltlab.wcf.payment.type</definitionname>
-                       <classname><![CDATA[wcf\system\payment\type\PaidSubscriptionPaymentType]]></classname>
+                       <classname>wcf\system\payment\type\PaidSubscriptionPaymentType</classname>
                </type>
                
                <!-- bulk processable objects -->
                <type>
                        <name>com.woltlab.wcf.bulkProcessing.user</name>
                        <definitionname>com.woltlab.wcf.bulkProcessableObject</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\UserBulkProcessableObjectType]]></classname>
+                       <classname>wcf\system\bulk\processing\user\UserBulkProcessableObjectType</classname>
                </type>
                <!-- /bulk processable objects -->
                
@@ -1009,35 +826,35 @@
                <type>
                        <name>com.woltlab.wcf.delete</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.action</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\DeleteUserBulkProcessingAction]]></classname>
+                       <classname>wcf\system\bulk\processing\user\DeleteUserBulkProcessingAction</classname>
                        <action>delete</action>
                        <permissions>admin.user.canDeleteUser</permissions>
                </type>
                <type>
                        <name>com.woltlab.wcf.assignToUserGroups</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.action</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\AssignToUserGroupsUserBulkProcessingAction]]></classname>
+                       <classname>wcf\system\bulk\processing\user\AssignToUserGroupsUserBulkProcessingAction</classname>
                        <action>assignToUserGroups</action>
                        <permissions>admin.user.canEditUser</permissions>
                </type>
                <type>
                        <name>com.woltlab.wcf.removeFromUserGroups</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.action</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\RemoveFromUserGroupsUserBulkProcessingAction]]></classname>
+                       <classname>wcf\system\bulk\processing\user\RemoveFromUserGroupsUserBulkProcessingAction</classname>
                        <action>removeFromUserGroups</action>
                        <permissions>admin.user.canEditUser</permissions>
                </type>
                <type>
                        <name>com.woltlab.wcf.sendMail</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.action</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\SendMailUserBulkProcessingAction]]></classname>
+                       <classname>wcf\system\bulk\processing\user\SendMailUserBulkProcessingAction</classname>
                        <action>sendMail</action>
                        <permissions>admin.user.canMailUser</permissions>
                </type>
                <type>
                        <name>com.woltlab.wcf.exportMailAddress</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.action</definitionname>
-                       <classname><![CDATA[wcf\system\bulk\processing\user\ExportMailAddressUserBulkProcessingAction]]></classname>
+                       <classname>wcf\system\bulk\processing\user\ExportMailAddressUserBulkProcessingAction</classname>
                        <action>exportMailAddress</action>
                        <permissions>admin.user.canMailUser</permissions>
                </type>
@@ -1047,62 +864,62 @@
                <type>
                        <name>com.woltlab.wcf.username</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+                       <classname>wcf\system\condition\UserUsernameCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.email</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+                       <classname>wcf\system\condition\UserEmailCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.userGroup</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+                       <classname>wcf\system\condition\UserGroupCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.languages</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+                       <classname>wcf\system\condition\UserLanguageCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDate</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDateInterval</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.lastActivityTime</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserTimestampPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserTimestampPropertyCondition</classname>
                        <conditiongroup>general</conditiongroup>
                        <propertyname>lastActivityTime</propertyname>
                </type>
                <type>
                        <name>com.woltlab.wcf.avatar</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+                       <classname>wcf\system\condition\UserAvatarCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.state</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+                       <classname>wcf\system\condition\UserStateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.activityPoints</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>activityPoints</propertyname>
                        <minvalue>0</minvalue>
@@ -1110,7 +927,7 @@
                <type>
                        <name>com.woltlab.wcf.likesReceived</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
@@ -1118,7 +935,7 @@
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+                       <classname>wcf\system\condition\UserOptionsCondition</classname>
                        <conditiongroup>userOptions</conditiongroup>
                </type>
                <!-- /user bulk processing conditions -->
@@ -1127,55 +944,55 @@
                <type>
                        <name>com.woltlab.wcf.username</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+                       <classname>wcf\system\condition\UserUsernameCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.email</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+                       <classname>wcf\system\condition\UserEmailCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.userGroup</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+                       <classname>wcf\system\condition\UserGroupCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.languages</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+                       <classname>wcf\system\condition\UserLanguageCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDate</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.registrationDateInterval</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+                       <classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.avatar</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+                       <classname>wcf\system\condition\UserAvatarCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.state</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+                       <classname>wcf\system\condition\UserStateCondition</classname>
                        <conditiongroup>general</conditiongroup>
                </type>
                <type>
                        <name>com.woltlab.wcf.activityPoints</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>activityPoints</propertyname>
                        <minvalue>0</minvalue>
@@ -1183,7 +1000,7 @@
                <type>
                        <name>com.woltlab.wcf.likesReceived</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+                       <classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
                        <conditiongroup>contents</conditiongroup>
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
@@ -1191,9 +1008,143 @@
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+                       <classname>wcf\system\condition\UserOptionsCondition</classname>
                        <conditiongroup>userOptions</conditiongroup>
                </type>
                <!-- /user search conditions -->
+               
+               <!-- box controllers -->
+               <type>
+                       <name>com.woltlab.wcf.recentActivityList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\RecentActivityListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.paidSubscriptions</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\PaidSubscriptionsBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.registerButton</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\RegisterButtonBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.signedInAs</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\SignedInAsBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.statistics</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\StatisticsBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.userList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\UserListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.userOnlineList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\UserOnlineListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.staffOnlineList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\StaffOnlineListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.todaysBirthdays</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\TodaysBirthdaysBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.todaysFollowingBirthdays</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\TodaysFollowingBirthdaysBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.followingsOnline</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\FollowingsOnlineBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.pageCommentList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\PageCommentListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.articleCategories</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\ArticleCategoriesBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.articleList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\ArticleListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.articleCommentList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\ArticleCommentListBoxController</classname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.whoWasOnline</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\WhoWasOnlineBoxController</classname>
+               </type>
+               <!-- /box controllers -->
+               
+               <!-- simple acl -->
+               <type>
+                       <name>com.woltlab.wcf.page</name>
+                       <definitionname>com.woltlab.wcf.acl.simple</definitionname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.box</name>
+                       <definitionname>com.woltlab.wcf.acl.simple</definitionname>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.media</name>
+                       <definitionname>com.woltlab.wcf.acl.simple</definitionname>
+               </type>
+               <!-- /simple acl -->
+               
+               <!-- article list box condition -->
+               <type>
+                       <name>com.woltlab.wcf.articleCategory</name>
+                       <definitionname>com.woltlab.wcf.box.articleList.condition</definitionname>
+                       <classname>wcf\system\condition\article\ArticleCategoryCondition</classname>
+               </type>
+               <!-- /article list box condition -->
+               
+               <!-- recent activity list box condition -->
+               <type>
+                       <name>com.woltlab.wcf.excludedObjectType</name>
+                       <definitionname>com.woltlab.wcf.box.recentActivityList.condition</definitionname>
+                       <classname>wcf\system\condition\user\activity\event\UserActivityEventExcludedObjectTypeCondition</classname>
+               </type>
+               <!-- /recent activity box condition -->
+               
+               <!-- deprecated -->
+               <type>
+                       <name>com.woltlab.wcf.page.controller</name>
+                       <definitionname>com.woltlab.wcf.condition.notice</definitionname>
+                       <classname>wcf\system\condition\MultiPageControllerCondition</classname>
+                       <conditionobject>com.woltlab.wcf.page</conditionobject>
+               </type>
+               <type>
+                       <name>com.woltlab.wcf.page.controller</name>
+                       <definitionname>com.woltlab.wcf.condition.ad</definitionname>
+                       <classname>wcf\system\condition\MultiPageControllerCondition</classname>
+                       <conditionobject>com.woltlab.wcf.page</conditionobject>
+               </type>
+               <!-- /deprecated -->
        </import>
+       <delete>
+               <type name="com.woltlab.wcf.collapsibleSidebar">
+                       <definitionname>com.woltlab.wcf.collapsibleContent</definitionname>
+               </type>
+       </delete>
 </data>