diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index d84a3e892..de9852004 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -275,8 +275,7 @@ class BoardService {
 			'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE],
 			'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE]
 		]);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE);
 		return $new_board;
 
 	}
@@ -299,8 +298,7 @@ class BoardService {
 		$board = $this->find($id);
 		$board->setDeletedAt(time());
 		$board = $this->boardMapper->update($board);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE);
 		return $board;
 	}
 
@@ -321,8 +319,7 @@ class BoardService {
 		$board = $this->find($id);
 		$board->setDeletedAt(0);
 		$board = $this->boardMapper->update($board);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE);
 		return $board;
 	}
 
@@ -438,8 +435,7 @@ class BoardService {
 
 		$newAcl = $this->aclMapper->insert($acl);
 		$this->boardMapper->mapAcl($newAcl);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
 		return $newAcl;
 	}
 
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 0f0f53a8d..721ebe165 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -363,8 +363,7 @@ class CardService {
 		$card = $this->cardMapper->find($id);
 		$card->setArchived(true);
 		$newCard = $this->cardMapper->update($card);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE);
 		return $newCard;
 	}
 
diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php
index 44d08c805..0947986c4 100644
--- a/lib/Service/StackService.php
+++ b/lib/Service/StackService.php
@@ -74,7 +74,7 @@ class StackService {
 	}
 
 	private function enrichStackWithCards($stack) {
-		$cards = $this->cardMapper->findAll($stack->id);
+		$cards = $this->cardMapper->findAll($stack->getId());
 
 		if(is_null($cards)) {
 			return;
@@ -201,8 +201,7 @@ class StackService {
 		$stack->setBoardId($boardId);
 		$stack->setOrder($order);
 		$stack = $this->stackMapper->insert($stack);
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_CREATE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_CREATE);
 		return $stack;
 	}
 
@@ -226,8 +225,7 @@ class StackService {
 		$stack->setDeletedAt(time());
 		$stack = $this->stackMapper->update($stack);
 
-		$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_DELETE);
-		$this->activityManager->sendToUsers($event);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_DELETE);
 
 		$this->enrichStackWithCards($stack);
 		return $stack;
@@ -276,7 +274,7 @@ class StackService {
 		$stack->setDeletedAt($deletedAt);
 		$changes->setAfter($stack);
 		$stack = $this->stackMapper->update($stack);
-		$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_BOARD, $changes->getAfter(), ActivityManager::SUBJECT_STACK_UPDATE, $changes->getBefore());
+		$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_BOARD, $changes, ActivityManager::SUBJECT_STACK_UPDATE);
 		return $stack;
 	}