diff --git a/file/lib/acp/page/ChatRoomListPage.class.php b/file/lib/acp/page/ChatRoomListPage.class.php
index 47a86b6..efbe911 100644
--- a/file/lib/acp/page/ChatRoomListPage.class.php
+++ b/file/lib/acp/page/ChatRoomListPage.class.php
@@ -4,12 +4,11 @@
 /**
  * Lists available chatrooms.
  * 
- * @author	Tim Düsterhus
- * @copyright	2011-2012 Tim Düsterhus
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf.bbcode
+ * @author 	Tim Düsterhus
+ * @copyright	2010-2012 Tim Düsterhus
+ * @license	Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
+ * @package	timwolla.wcf.chat
  * @subpackage	acp.page
- * @category 	Community Framework
  */
 class ChatRoomListPage extends \wcf\page\MultipleLinkPage {
 	/**
diff --git a/file/lib/data/chat/room/ChatRoomAction.class.php b/file/lib/data/chat/room/ChatRoomAction.class.php
new file mode 100644
index 0000000..09f2a28
--- /dev/null
+++ b/file/lib/data/chat/room/ChatRoomAction.class.php
@@ -0,0 +1,28 @@
+<?php
+namespace wcf\data\chat\room;
+
+/**
+ * Executes chatroom-related actions.
+ * 
+ * @author 	Tim Düsterhus
+ * @copyright	2010-2012 Tim Düsterhus
+ * @license	Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
+ * @package	timwolla.wcf.chat
+ * @subpackage	data.chat.room
+ */
+class ChatRoomAction extends \wcf\data\AbstractDatabaseObjectAction {
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$className
+	 */
+	protected $className = '\wcf\data\chat\room\ChatRoomEditor';
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 */
+	protected $permissionsDelete = array('admin.content.chat.canDeleteRoom');
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 */
+	protected $permissionsUpdate = array('admin.content.chat.canEditRoom');
+}
diff --git a/file/lib/data/chat/room/ChatRoomEditor.class.php b/file/lib/data/chat/room/ChatRoomEditor.class.php
index 73e0a2a..ee1a1a5 100644
--- a/file/lib/data/chat/room/ChatRoomEditor.class.php
+++ b/file/lib/data/chat/room/ChatRoomEditor.class.php
@@ -20,7 +20,7 @@ class ChatRoomEditor extends \wcf\data\DatabaseObjectEditor implements \wcf\data
 	 * Clears the room cache.
 	 */
 	public static function resetCache() {
-		self::getCache();
-		CacheHandler::getInstance()->clearResource('chatrooms');
+		ChatRoom::getCache();
+		\wcf\system\cache\CacheHandler::getInstance()->clearResource('chatrooms');
 	}
 }