diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index 186e98661..9b9c8ffa7 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -118,6 +118,10 @@
 		<action name="procMemberAdminUpdateMembersGroup" type="controller" ruleset="manageMemberGroup" />
 		<action name="procMemberAdminDeleteMembers" type="controller" />
 	</actions>
+	<eventHandlers>
+		<eventHandler after="document.getDocumentMenu" class="controller" method="triggerGetDocumentMenu" />
+		<eventHandler after="comment.getCommentMenu" class="controller" method="triggerGetCommentMenu" />
+	</eventHandlers>
 	<menus>
 		<menu name="userList">
 			<title xml:lang="en">Member List</title>
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 976688efb..840963d6a 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -104,10 +104,6 @@ class Member extends ModuleObject
 		FileHandler::makeDir('./files/member_extra_info/image_mark');
 		FileHandler::makeDir('./files/member_extra_info/profile_image');
 		FileHandler::makeDir('./files/member_extra_info/signature');
-
-		// 2013. 11. 22 add menu when popup document menu called
-		$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-		$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
 	}
 
 	/**
@@ -233,10 +229,6 @@ class Member extends ModuleObject
 		if(FileHandler::exists('./files/ruleset/insertMember.xml')) return true;
 		if(FileHandler::exists('./files/ruleset/login.xml')) return true;
 
-		// 2013. 11. 22 add menu when popup document menu called
-		if(!ModuleModel::getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-		if(!ModuleModel::getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
-
 		// Allow duplicate nickname
 		if($config->allow_duplicate_nickname == 'Y')
 		{
@@ -556,12 +548,6 @@ class Member extends ModuleObject
 			FileHandler::removeFile('./files/ruleset/login.xml');
 		}
 
-		// 2013. 11. 22 add menu when popup document menu called
-		if(!ModuleModel::getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
-			$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-		if(!ModuleModel::getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
-			$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
-
 		// Allow duplicate nickname
 		if($config->allow_duplicate_nickname == 'Y')
 		{
diff --git a/modules/poll/conf/module.xml b/modules/poll/conf/module.xml
index 9b102a5c9..1dd0cd384 100644
--- a/modules/poll/conf/module.xml
+++ b/modules/poll/conf/module.xml
@@ -6,24 +6,32 @@
 		<action name="getPollinfo" type="model" />
 		<action name="getPollitemInfo" type="model" />
 		<action name="getPollGetColorsetList" type="model" />
-		
+
 		<action name="procPollInsert" type="controller" />
 		<action name="procPollInsertItem" type="controller" permission="member" />
 		<action name="procPollDeleteItem" type="controller" permission="member" />
 		<action name="procPoll" type="controller" ruleset="poll" />
 		<action name="procPollViewResult" type="controller" />
 		<action name="procPollGetList" type="controller" permission="root" />
-		
+
 		<action name="dispPollAdminList" type="view" admin_index="true" menu_name="poll" menu_index="true" />
 		<action name="dispPollAdminResult" type="view" />
 		<action name="dispPollAdminConfig" type="view" />
-		
+
 		<action name="getPollAdminTarget" type="model" />
-		
+
 		<action name="procPollAdminAddCart" type="controller" />
 		<action name="procPollAdminDeleteChecked" type="controller" ruleset="deleteChecked" />
 		<action name="procPollAdminInsertConfig" type="controller" ruleset="insertConfig" />
 	</actions>
+	<eventHandlers>
+		<eventHandler after="document.insertDocument" class="controller" method="triggerInsertDocumentPoll" />
+		<eventHandler after="document.updateDocument" class="controller" method="triggerUpdateDocumentPoll" />
+		<eventHandler after="document.deleteDocument" class="controller" method="triggerDeleteDocumentPoll" />
+		<eventHandler after="comment.insertComment" class="controller" method="triggerInsertCommentPoll" />
+		<eventHandler after="comment.updateComment" class="controller" method="triggerUpdateCommentPoll" />
+		<eventHandler after="comment.deleteComment" class="controller" method="triggerDeleteCommentPoll" />
+	</eventHandlers>
 	<menus>
 		<menu name="poll">
 			<title xml:lang="en">Poll</title>
diff --git a/modules/poll/poll.class.php b/modules/poll/poll.class.php
index 046248aca..96c561d98 100644
--- a/modules/poll/poll.class.php
+++ b/modules/poll/poll.class.php
@@ -12,22 +12,12 @@ class poll extends ModuleObject
 	 */
 	function moduleInstall()
 	{
-		// Register in the action forward (to use in administrator mode)
-		$oModuleController = getController('module');
 		// Set the default skin
-		$oModuleController = getController('module');
-
 		$config = new stdClass;
 		$config->skin = 'default';
 		$config->colorset = 'normal';
+		$oModuleController = ModuleController::getInstance();
 		$oModuleController->insertModuleConfig('poll', $config);
-		// 2007.10.17 When deleting posts/comments delete the poll as well
-		$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-		$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-		$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-		$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
-		$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-		$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
 	}
 
 	/**
@@ -35,16 +25,7 @@ class poll extends ModuleObject
 	 */
 	function checkUpdate()
 	{
-		$oModuleModel = getModel('module');
-		$oDB = &DB::getInstance();
-
-		// 2007.10.17 When deleting posts/comments delete the poll as well
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
-		if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
+		$oDB = DB::getInstance();
 
 		if(!$oDB->isColumnExists('poll', 'poll_type'))
 		{
@@ -69,24 +50,7 @@ class poll extends ModuleObject
 	 */
 	function moduleUpdate()
 	{
-		$oModuleModel = getModel('module');
-		$oModuleController = getController('module');
-		$oDB = &DB::getInstance();
-
-		// 2007.10.17 When deleting posts/comments delete the poll as well
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
-			$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
-			$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
-		// 2008.04.22 A poll connection to add posts/comments
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) 
-			$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) 
-			$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) 
-			$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-		if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) 
-			$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+		$oDB = DB::getInstance();
 
 		if(!$oDB->isColumnExists('poll','poll_type'))
 		{
@@ -104,13 +68,6 @@ class poll extends ModuleObject
 		}
 	}
 
-	/**
-	 * @brief Re-generate the cache file
-	 */
-	function recompileCache()
-	{
-	}
-
 	/**
 	 * @brief Check if this poll could display member information
 	 */
diff --git a/modules/rss/conf/module.xml b/modules/rss/conf/module.xml
index 381309f53..182f727c1 100644
--- a/modules/rss/conf/module.xml
+++ b/modules/rss/conf/module.xml
@@ -4,12 +4,17 @@
 	<actions>
 		<action name="rss" type="view" />
 		<action name="atom" type="view" />
-		
+
 		<action name="dispRssAdminIndex" type="view" admin_index="true" menu_name="rss" menu_index="true" />
 		<action name="procRssAdminInsertConfig" type="controller" ruleset="insertRssConfig" />
 		<action name="procRssAdminInsertModuleConfig" type="controller" permission="manager" check_var="target_module_srl" />
 		<action name="procRssAdminDeleteFeedImage" type="controller" />
 	</actions>
+	<eventHandlers>
+		<eventHandler after="moduleHandler.proc" class="controller" method="triggerRssUrlInsert" />
+		<eventHandler after="module.procModuleAdminCopyModule" class="controller" method="triggerCopyModule" />
+		<eventHandler before="module.dispAdditionSetup" class="view" method="triggerDispRssAdditionSetup" />
+	</eventHandlers>
 	<menus>
 		<menu name="rss">
 		<title xml:lang="en">RSS</title>
diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php
index 3ac45ef6d..4ba3f834d 100644
--- a/modules/rss/rss.class.php
+++ b/modules/rss/rss.class.php
@@ -13,22 +13,10 @@ class rss extends ModuleObject
 		array('rss', 'view', 'atom'),
 	);
 
-	// Add triggers
-	protected static $add_triggers = array(
-		array('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'),
-		array('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'),
-		array('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'),
-	);
-
-	// Remove triggers
-	protected static $remove_triggers = array(
-		array('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'),
-	);
-
 	/**
 	 * Install
 	 */
-	function moduleInstall()
+	public function moduleInstall()
 	{
 		$this->moduleUpdate();
 	}
@@ -36,32 +24,12 @@ class rss extends ModuleObject
 	/**
 	 * Check update
 	 */
-	function checkUpdate()
+	public function checkUpdate()
 	{
-		$oModuleModel = getModel('module');
-
 		// Check forwards for add
 		foreach(self::$add_forwards as $forward)
 		{
-			if(!$oModuleModel->getActionForward($forward[2]))
-			{
-				return true;
-			}
-		}
-
-		// Check triggers for add
-		foreach(self::$add_triggers as $trigger)
-		{
-			if(!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
-			{
-				return true;
-			}
-		}
-
-		// Check triggers for remove
-		foreach(self::$remove_triggers as $trigger)
-		{
-			if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
+			if(!ModuleModel::getActionForward($forward[2]))
 			{
 				return true;
 			}
@@ -73,42 +41,16 @@ class rss extends ModuleObject
 	/**
 	 * Update
 	 */
-	function moduleUpdate()
+	public function moduleUpdate()
 	{
-		$oModuleModel = getModel('module');
-		$oModuleController = getController('module');
-
 		// Add forwards
 		foreach(self::$add_forwards as $forward)
 		{
-			if(!$oModuleModel->getActionForward($forward[2]))
+			if(!ModuleModel::getActionForward($forward[2]))
 			{
-				$oModuleController->insertActionForward($forward[0], $forward[1], $forward[2]);
+				ModuleController::getInstance()->insertActionForward($forward[0], $forward[1], $forward[2]);
 			}
 		}
-
-		// Add triggers
-		foreach(self::$add_triggers as $trigger)
-		{
-			if(!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
-			{
-				$oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);
-			}
-		}
-
-		// Remove triggers
-		foreach(self::$remove_triggers as $trigger)
-		{
-			if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
-			{
-				$oModuleController->deleteTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);
-			}
-		}
-	}
-
-	function recompileCache()
-	{
-
 	}
 }
 /* End of file rss.class.php */