diff --git a/appinfo/routes.php b/appinfo/routes.php
index 186a7fef5..f3c58beb5 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -125,5 +125,8 @@
 		['name' => 'ApiColumns#createTextColumn', 'url' => '/api/2/columns/text', 'verb' => 'POST'],
 		['name' => 'ApiColumns#createSelectionColumn', 'url' => '/api/2/columns/selection', 'verb' => 'POST'],
 		['name' => 'ApiColumns#createDatetimeColumn', 'url' => '/api/2/columns/datetime', 'verb' => 'POST'],
+
+		['name' => 'ApiFavorite#create', 'url' => '/api/2/favorites/{nodeType}/{nodeId}', 'verb' => 'POST', 'requirements' => ['nodeType' => '(\d+)', 'nodeId' => '(\d+)']],
+		['name' => 'ApiFavorite#destroy', 'url' => '/api/2/favorites/{nodeType}/{nodeId}', 'verb' => 'DELETE', 'requirements' => ['nodeType' => '(\d+)', 'nodeId' => '(\d+)']],
 	]
 ];
diff --git a/composer.json b/composer.json
index b8d66398a..7d7694377 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
-		"psalm": "./vendor/bin/psalm.phar --show-info=true --no-cache",
+		"psalm": "./vendor/bin/psalm.phar --show-info=false --no-cache",
 		"psalm:update-baseline": "./vendor/bin/psalm.phar --update-baseline",
 		"psalm:fix": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"psalm:fix:dry": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType --dry-run",
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index 2d7573ad2..f80adc6b5 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -46,7 +46,7 @@ public function __construct(IAppManager $appManager, LoggerInterface $logger, IC
 
 	/**
 	 *
-	 * @return array{tables: array{enabled: bool, version: string, apiVersions: string[], column_types: string[]}}
+	 * @return array{tables: array{enabled: bool, version: string, apiVersions: string[], features: string[], column_types: string[]}}
 	 *
 	 * @inheritDoc
 	 */
@@ -63,6 +63,10 @@ public function getCapabilities(): array {
 				'apiVersions' => [
 					'1.0'
 				],
+				'features' => [
+					'favorite',
+					'archive',
+				],
 				'column_types' => [
 					'text-line',
 					$textColumnVariant,
diff --git a/lib/Command/RenameTable.php b/lib/Command/RenameTable.php
index 6e8c4f41b..3a41153b5 100644
--- a/lib/Command/RenameTable.php
+++ b/lib/Command/RenameTable.php
@@ -44,7 +44,8 @@ public function __construct(TableService $tableService, LoggerInterface $logger)
 
 	protected function configure(): void {
 		$this
-			->setName('tables:rename')
+			->setName('tables:update')
+			->setAliases(['tables:rename'])
 			->setDescription('Rename a table.')
 			->addArgument(
 				'ID',
@@ -62,6 +63,12 @@ protected function configure(): void {
 				InputOption::VALUE_OPTIONAL,
 				'New emoji.'
 			)
+			->addOption(
+				'archived',
+				'a',
+				InputOption::VALUE_NONE,
+				'Archived'
+			)
 		;
 	}
 
@@ -74,9 +81,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$id = $input->getArgument('ID');
 		$title = $input->getArgument('title');
 		$emoji = $input->getOption('emoji');
+		$archived = $input->getOption('archived');
 
 		try {
-			$table = $this->tableService->update($id, $title, $emoji, '');
+			$table = $this->tableService->update($id, $title, $emoji, $archived, '');
 
 			$arr = $table->jsonSerialize();
 			unset($arr['hasShares']);
diff --git a/lib/Controller/Api1Controller.php b/lib/Controller/Api1Controller.php
index a9d9a8566..65b6654f8 100644
--- a/lib/Controller/Api1Controller.php
+++ b/lib/Controller/Api1Controller.php
@@ -178,9 +178,9 @@ public function getTable(int $tableId): DataResponse {
 	 * 403: No permissions
 	 * 404: Not found
 	 */
-	public function updateTable(int $tableId, string $title = null, string $emoji = null): DataResponse {
+	public function updateTable(int $tableId, string $title = null, string $emoji = null, ?bool $archived = false): DataResponse {
 		try {
-			return new DataResponse($this->tableService->update($tableId, $title, $emoji, $this->userId)->jsonSerialize());
+			return new DataResponse($this->tableService->update($tableId, $title, $emoji, $archived, $this->userId)->jsonSerialize());
 		} catch (PermissionError $e) {
 			$this->logger->warning('A permission error occurred: ' . $e->getMessage());
 			$message = ['message' => $e->getMessage()];
diff --git a/lib/Controller/ApiFavoriteController.php b/lib/Controller/ApiFavoriteController.php
new file mode 100644
index 000000000..372b45892
--- /dev/null
+++ b/lib/Controller/ApiFavoriteController.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Tables\Controller;
+
+use Exception;
+use OCA\Tables\Errors\InternalError;
+use OCA\Tables\Errors\NotFoundError;
+use OCA\Tables\Errors\PermissionError;
+use OCA\Tables\ResponseDefinitions;
+use OCA\Tables\Service\FavoritesService;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\DB\Exception as DBException;
+use OCP\IL10N;
+use OCP\IRequest;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @psalm-import-type TablesTable from ResponseDefinitions
+ */
+class ApiFavoriteController extends AOCSController {
+	private FavoritesService $service;
+
+	public function __construct(
+		IRequest $request,
+		LoggerInterface $logger,
+		FavoritesService $service,
+		IL10N $n,
+		string $userId) {
+		parent::__construct($request, $logger, $n, $userId);
+		$this->service = $service;
+	}
+
+	/**
+	 * [api v2] Add a node (table or view) to user favorites
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @param int $nodeType
+	 * @param int $nodeId
+	 * @return DataResponse<Http::STATUS_OK, array{}, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND, array{message: string}, array{}>
+	 *
+	 * 200: Tables returned
+	 */
+	public function create(int $nodeType, int $nodeId): DataResponse {
+		try {
+			$this->service->addFavorite($nodeType, $nodeId);
+			return new DataResponse();
+		} catch (NotFoundError $e) {
+			return $this->handleNotFoundError($e);
+		} catch (PermissionError $e) {
+			return $this->handlePermissionError($e);
+		} catch (InternalError|DBException|Exception $e) {
+			return $this->handleError($e);
+		}
+	}
+
+
+	/**
+	 * [api v2] Remove a node (table or view) to from favorites
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @param int $nodeType
+	 * @param int $nodeId
+	 * @return DataResponse<Http::STATUS_OK, array{}, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND, array{message: string}, array{}>
+	 *
+	 * 200: Deleted table returned
+	 * 403: No permissions
+	 * 404: Not found
+	 */
+	public function destroy(int $nodeType, int $nodeId): DataResponse {
+		try {
+			$this->service->removeFavorite($nodeType, $nodeId);
+			return new DataResponse();
+		} catch (NotFoundError $e) {
+			return $this->handleNotFoundError($e);
+		} catch (PermissionError $e) {
+			return $this->handlePermissionError($e);
+		} catch (InternalError|DBException|Exception $e) {
+			return $this->handleError($e);
+		}
+	}
+}
diff --git a/lib/Controller/ApiTablesController.php b/lib/Controller/ApiTablesController.php
index 60db21cc9..9efe47b9f 100644
--- a/lib/Controller/ApiTablesController.php
+++ b/lib/Controller/ApiTablesController.php
@@ -106,9 +106,9 @@ public function create(string $title, ?string $emoji, string $template = 'custom
 	 * 403: No permissions
 	 * 404: Not found
 	 */
-	public function update(int $id, string $title = null, string $emoji = null): DataResponse {
+	public function update(int $id, ?string $title = null, ?string $emoji = null, ?bool $archived = null): DataResponse {
 		try {
-			return new DataResponse($this->service->update($id, $title, $emoji, $this->userId)->jsonSerialize());
+			return new DataResponse($this->service->update($id, $title, $emoji, $archived, $this->userId)->jsonSerialize());
 		} catch (PermissionError $e) {
 			return $this->handlePermissionError($e);
 		} catch (InternalError $e) {
diff --git a/lib/Controller/TableController.php b/lib/Controller/TableController.php
index 44d5d1b46..65d4e7fd0 100644
--- a/lib/Controller/TableController.php
+++ b/lib/Controller/TableController.php
@@ -70,9 +70,9 @@ public function destroy(int $id): DataResponse {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function update(int $id, string $title = null, string $emoji = null): DataResponse {
-		return $this->handleError(function () use ($id, $title, $emoji) {
-			return $this->service->update($id, $title, $emoji, $this->userId);
+	public function update(int $id, string $title = null, string $emoji = null, ?bool $archived = null): DataResponse {
+		return $this->handleError(function () use ($id, $title, $emoji, $archived) {
+			return $this->service->update($id, $title, $emoji, $archived, $this->userId);
 		});
 	}
 }
diff --git a/lib/Db/Table.php b/lib/Db/Table.php
index 1807a73d6..242496fe7 100644
--- a/lib/Db/Table.php
+++ b/lib/Db/Table.php
@@ -16,6 +16,8 @@
  * @method setTitle(string $title)
  * @method getEmoji(): string
  * @method setEmoji(string $emoji)
+ * @method getArchived(): bool
+ * @method setArchived(bool $archived)
  * @method getOwnership(): string
  * @method setOwnership(string $ownership)
  * @method getOwnerDisplayName(): string
@@ -26,6 +28,8 @@
  * @method setOnSharePermissions(array $onSharePermissions)
  * @method getHasShares(): bool
  * @method setHasShares(bool $hasShares)
+ * @method getFavorite(): bool
+ * @method setFavorite(bool $favorite)
  * @method getRowsCount(): int
  * @method setRowsCount(int $rowsCount)
  * @method getColumnsCount(): int
@@ -52,10 +56,12 @@ class Table extends Entity implements JsonSerializable {
 	protected ?string $createdAt = null;
 	protected ?string $lastEditBy = null;
 	protected ?string $lastEditAt = null;
+	protected bool $archived = false;
 	protected ?bool $isShared = null;
 	protected ?array $onSharePermissions = null;
 
 	protected ?bool $hasShares = false;
+	protected ?bool $favorite = false;
 	protected ?int $rowsCount = 0;
 	protected ?int $columnsCount = 0;
 	protected ?array $views = null;
@@ -63,6 +69,7 @@ class Table extends Entity implements JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('archived', 'boolean');
 	}
 
 	/**
@@ -79,7 +86,9 @@ public function jsonSerialize(): array {
 			'createdAt' => $this->createdAt ?: '',
 			'lastEditBy' => $this->lastEditBy ?: '',
 			'lastEditAt' => $this->lastEditAt ?: '',
+			'archived' => $this->archived,
 			'isShared' => !!$this->isShared,
+			'favorite' => $this->favorite,
 			'onSharePermissions' => $this->getSharePermissions(),
 			'hasShares' => !!$this->hasShares,
 			'rowsCount' => $this->rowsCount ?: 0,
diff --git a/lib/Db/View.php b/lib/Db/View.php
index 3e72d6240..73684b55b 100644
--- a/lib/Db/View.php
+++ b/lib/Db/View.php
@@ -35,6 +35,8 @@
  * @method setOnSharePermissions(array $onSharePermissions)
  * @method getHasShares(): bool
  * @method setHasShares(bool $hasShares)
+ * @method getFavorite(): bool
+ * @method setFavorite(bool $favorite)
  * @method getRowsCount(): int
  * @method setRowsCount(int $rowCount)
  * @method getOwnership(): string
@@ -57,6 +59,7 @@ class View extends Entity implements JsonSerializable {
 	protected ?bool $isShared = null;
 	protected ?array $onSharePermissions = null;
 	protected ?bool $hasShares = false;
+	protected bool $favorite = false;
 	protected ?int $rowsCount = 0;
 	protected ?string $ownership = null;
 	protected ?string $ownerDisplayName = null;
@@ -137,6 +140,7 @@ public function jsonSerialize(): array {
 			'columns' => $this->getColumnsArray(),
 			'sort' => $this->getSortArray(),
 			'isShared' => !!$this->isShared,
+			'favorite' => $this->favorite,
 			'onSharePermissions' => $this->getSharePermissions(),
 			'hasShares' => !!$this->hasShares,
 			'rowsCount' => $this->rowsCount ?: 0,
diff --git a/lib/Migration/Version000800Date20240222000000.php b/lib/Migration/Version000800Date20240222000000.php
new file mode 100644
index 000000000..9a8d8a4d0
--- /dev/null
+++ b/lib/Migration/Version000800Date20240222000000.php
@@ -0,0 +1,60 @@
+<?php
+
+/** @noinspection PhpUnused */
+
+declare(strict_types=1);
+
+namespace OCA\Tables\Migration;
+
+use Closure;
+use OCP\DB\Exception;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version000800Date20240222000000 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 * @throws Exception
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if ($schema->hasTable('tables_tables')) {
+			$table = $schema->getTable('tables_tables');
+			$table->addColumn('archived', Types::BOOLEAN, [
+				'default' => false,
+				'notnull' => true,
+			]);
+		}
+
+		if (!$schema->hasTable('tables_favorites')) {
+			$table = $schema->createTable('tables_favorites');
+			$table->addColumn('id', Types::BIGINT, [
+				'notnull' => true,
+				'autoincrement' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('node_type', Types::SMALLINT, [
+				'notnull' => true,
+			]);
+			$table->addColumn('node_id', Types::BIGINT, [
+				'notnull' => true,
+			]);
+			$table->addColumn('user_id', Types::STRING, [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['user_id'], 'idx_tables_fav_uid');
+		}
+
+		return $schema;
+	}
+
+}
diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php
index 42668bce5..172b760a0 100644
--- a/lib/ResponseDefinitions.php
+++ b/lib/ResponseDefinitions.php
@@ -23,6 +23,7 @@
  *  sort: list<array{columnId: int, mode: 'ASC'|'DESC'}>,
  *  filter: list<list<array{columnId: int, operator: 'begins-with'|'ends-with'|'contains'|'is-equal'|'is-greater-than'|'is-greater-than-or-equal'|'is-lower-than'|'is-lower-than-or-equal'|'is-empty', value: string|int|float}>>,
  * 	isShared: bool,
+ *	favorite: bool,
  * 	onSharePermissions: ?array{
  * 		read: bool,
  * 		create: bool,
@@ -44,6 +45,8 @@
  * 	createdAt: string,
  * 	lastEditBy: string,
  * 	lastEditAt: string,
+ *	archived: bool,
+ *	favorite: bool,
  * 	isShared: bool,
  * 	onSharePermissions: ?array{
  * 		read: bool,
diff --git a/lib/Service/FavoritesService.php b/lib/Service/FavoritesService.php
new file mode 100644
index 000000000..d4737f4b4
--- /dev/null
+++ b/lib/Service/FavoritesService.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2024 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Tables\Service;
+
+use OCA\Tables\AppInfo\Application;
+use OCA\Tables\Errors\InternalError;
+use OCA\Tables\Errors\NotFoundError;
+use OCA\Tables\Errors\PermissionError;
+use OCP\Cache\CappedMemoryCache;
+use OCP\DB\Exception;
+use OCP\IDBConnection;
+
+class FavoritesService {
+
+	private IDBConnection $connection;
+	private PermissionsService $permissionsService;
+	private ?string $userId;
+	private CappedMemoryCache $cache;
+
+	public function __construct(
+		IDBConnection $connection,
+		PermissionsService $permissionsService,
+		?string $userId
+	) {
+		$this->connection = $connection;
+		$this->permissionsService = $permissionsService;
+		$this->userId = $userId;
+		// The cache usage is currently not unique to the user id as only a memory cache is used
+		$this->cache = new CappedMemoryCache();
+	}
+
+	public function isFavorite(int $nodeType, int $id): bool {
+		$cacheKey = $nodeType . '_' . $id;
+		if ($cached = $this->cache->get($cacheKey)) {
+			return $cached;
+		}
+
+		$this->cache->clear();
+		$qb = $this->connection->getQueryBuilder();
+		$qb->select('*')
+			->from('tables_favorites')
+			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->userId)));
+
+		$result = $qb->executeQuery();
+		while ($row = $result->fetch()) {
+			$this->cache->set($row['node_type'] . '_' . $row['node_id'], true);
+		}
+
+		// Set the cache for not found matches still to avoid further queries
+		if (!$this->cache->get($cacheKey)) {
+			$this->cache->set($cacheKey, false);
+		}
+
+		return $this->cache->get($cacheKey);
+	}
+
+	/**
+	 * @throws Exception
+	 * @throws InternalError
+	 * @throws NotFoundError
+	 * @throws PermissionError
+	 */
+	public function addFavorite(int $nodeType, int $id): void {
+		$this->checkValidNodeType($nodeType);
+		$this->checkAccessToNode($nodeType, $id);
+
+		$qb = $this->connection->getQueryBuilder();
+		$qb->insert('tables_favorites')
+			->values([
+				'user_id' => $qb->createNamedParameter($this->userId),
+				'node_type' => $qb->createNamedParameter($nodeType),
+				'node_id' => $qb->createNamedParameter($id),
+			]);
+		$qb->executeStatement();
+		$this->cache->set($nodeType . '_' . $id, true);
+	}
+
+	/**
+	 * @throws Exception
+	 * @throws InternalError
+	 * @throws NotFoundError
+	 * @throws PermissionError
+	 */
+	public function removeFavorite(int $nodeType, int $id): void {
+		$this->checkValidNodeType($nodeType);
+		$this->checkAccessToNode($nodeType, $id);
+
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('tables_favorites')
+			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($this->userId)))
+			->andWhere($qb->expr()->eq('node_type', $qb->createNamedParameter($nodeType)))
+			->andWhere($qb->expr()->eq('node_id', $qb->createNamedParameter($id)));
+		$qb->executeStatement();
+		$this->cache->set($nodeType . '_' . $id, false);
+	}
+
+	/**
+	 * @throws InternalError
+	 */
+	private function checkValidNodeType(int $nodeType): void {
+		if (!in_array($nodeType, [Application::NODE_TYPE_TABLE, Application::NODE_TYPE_VIEW])) {
+			throw new InternalError('Invalid node type');
+		}
+	}
+
+	/**
+	 * @throws PermissionError
+	 */
+	private function checkAccessToNode(int $nodeType, int $nodeId): void {
+		if ($this->permissionsService->canAccessNodeById($nodeType, $nodeId)) {
+			return;
+		}
+
+		throw new PermissionError('Invalid node type and id');
+	}
+
+}
diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
index 988462a7a..e28fe5fcb 100644
--- a/lib/Service/TableService.php
+++ b/lib/Service/TableService.php
@@ -6,6 +6,7 @@
 
 use DateTime;
 
+use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Db\Table;
 use OCA\Tables\Db\TableMapper;
 use OCA\Tables\Errors\InternalError;
@@ -38,6 +39,9 @@ class TableService extends SuperService {
 
 	protected UserHelper $userHelper;
 
+	protected FavoritesService $favoritesService;
+
+
 	protected IL10N $l;
 
 	public function __construct(
@@ -51,6 +55,7 @@ public function __construct(
 		ViewService $viewService,
 		ShareService $shareService,
 		UserHelper $userHelper,
+		FavoritesService $favoritesService,
 		IL10N $l
 	) {
 		parent::__construct($logger, $userId, $permissionsService);
@@ -61,6 +66,7 @@ public function __construct(
 		$this->viewService = $viewService;
 		$this->shareService = $shareService;
 		$this->userHelper = $userHelper;
+		$this->favoritesService = $favoritesService;
 		$this->l = $l;
 	}
 
@@ -197,6 +203,11 @@ private function enhanceTable(Table $table, string $userId): void {
 			$table->setViews($this->viewService->findAll($table));
 		}
 
+		if ($this->favoritesService->isFavorite(Application::NODE_TYPE_TABLE, $table->getId())) {
+			$table->setFavorite(true);
+		}
+
+
 	}
 
 
@@ -420,7 +431,7 @@ public function delete(int $id, ?string $userId = null): Table {
 	 * @throws NotFoundError
 	 * @throws PermissionError
 	 */
-	public function update(int $id, ?string $title, ?string $emoji, ?string $userId = null): Table {
+	public function update(int $id, ?string $title, ?string $emoji, ?bool $archived = null, ?string $userId = null): Table {
 		$userId = $this->permissionsService->preCheckUserId($userId);
 
 		try {
@@ -445,6 +456,9 @@ public function update(int $id, ?string $title, ?string $emoji, ?string $userId
 		if ($emoji !== null) {
 			$table->setEmoji($emoji);
 		}
+		if ($archived !== null) {
+			$table->setArchived($archived);
+		}
 		$table->setLastEditBy($userId);
 		$table->setLastEditAt($time->format('Y-m-d H:i:s'));
 		try {
diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php
index 5dd6297fd..4593086a0 100644
--- a/lib/Service/ViewService.php
+++ b/lib/Service/ViewService.php
@@ -7,6 +7,7 @@
 use DateTime;
 use Exception;
 
+use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Db\Table;
 use OCA\Tables\Db\View;
 use OCA\Tables\Db\ViewMapper;
@@ -34,6 +35,8 @@ class ViewService extends SuperService {
 
 	protected UserHelper $userHelper;
 
+	protected FavoritesService $favoritesService;
+
 	protected IL10N $l;
 
 	public function __construct(
@@ -44,6 +47,7 @@ public function __construct(
 		ShareService $shareService,
 		RowService $rowService,
 		UserHelper $userHelper,
+		FavoritesService $favoritesService,
 		IL10N $l
 	) {
 		parent::__construct($logger, $userId, $permissionsService);
@@ -52,6 +56,7 @@ public function __construct(
 		$this->shareService = $shareService;
 		$this->rowService = $rowService;
 		$this->userHelper = $userHelper;
+		$this->favoritesService = $favoritesService;
 	}
 
 
@@ -395,6 +400,10 @@ private function enhanceView(View $view, string $userId): void {
 				}
 			}
 		}
+
+		if ($this->favoritesService->isFavorite(Application::NODE_TYPE_VIEW, $view->getId())) {
+			$view->setFavorite(true);
+		}
 	}
 
 	/**
diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue
index bca3c05dd..9ec1263eb 100644
--- a/src/modules/navigation/partials/NavigationTableItem.vue
+++ b/src/modules/navigation/partials/NavigationTableItem.vue
@@ -12,10 +12,12 @@
 			<template v-if="table.emoji">
 				{{ table.emoji }}
 			</template>
+
 			<template v-else>
 				<Table :size="20" />
 			</template>
 		</template>
+
 		<template #counter>
 			<NcCounterBubble v-if="canReadData(table)">
 				{{ n('tables', '%n row', '%n rows', table.rowsCount, {}) }}
@@ -27,6 +29,7 @@
 		</template>
 
 		<template #actions>
+			<!-- EDIT -->
 			<NcActionButton v-if="canManageElement(table) "
 				:close-after-click="true"
 				@click="emit('tables:table:edit', table.id)">
@@ -35,6 +38,8 @@
 				</template>
 				{{ t('tables', 'Edit table') }}
 			</NcActionButton>
+
+			<!-- CREATE VIEW -->
 			<NcActionButton v-if="canManageElement(table)"
 				:close-after-click="true"
 				@click="createView">
@@ -43,12 +48,16 @@
 				</template>
 				{{ t('tables', 'Create view') }}
 			</NcActionButton>
+
+			<!-- SHARE -->
 			<NcActionButton v-if="canShareElement(table)"
 				icon="icon-share"
 				:close-after-click="true"
 				@click="actionShowShare">
 				{{ t('tables', 'Share') }}
 			</NcActionButton>
+
+			<!-- IMPORT -->
 			<NcActionButton v-if="canCreateRowInElement(table)"
 				:close-after-click="true"
 				@click="actionShowImport(table)">
@@ -57,6 +66,8 @@
 					<Import :size="20" />
 				</template>
 			</NcActionButton>
+
+			<!-- INTEGRATION -->
 			<NcActionButton
 				:close-after-click="true"
 				@click="actionShowIntegration">
@@ -65,6 +76,48 @@
 					<Connection :size="20" />
 				</template>
 			</NcActionButton>
+
+			<!-- FAVORITE -->
+			<NcActionButton v-if="!table.favorite && !table.archived"
+				:close-after-click="true"
+				@click="toggleFavoriteTable(true)">
+				{{ t('tables', 'Add to favorites') }}
+				<template #icon>
+					<Star :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- UNFAVORITE -->
+			<NcActionButton v-if="table.favorite"
+				:close-after-click="true"
+				@click="toggleFavoriteTable(false)">
+				{{ t('tables', 'Remove from favorites') }}
+				<template #icon>
+					<StarOutline :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- ARCHIVE -->
+			<NcActionButton v-if="canManageElement(table) && !table.archived && !table.favorite"
+				:close-after-click="true"
+				@click="toggleArchiveTable(true)">
+				{{ t('tables', 'Archive table') }}
+				<template #icon>
+					<ArchiveArrowDown :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- UNARCHIVE -->
+			<NcActionButton v-if="canManageElement(table) && table.archived"
+				:close-after-click="true"
+				@click="toggleArchiveTable(false)">
+				{{ t('tables', 'Unarchive table') }}
+				<template #icon>
+					<ArchiveArrowUpOutline :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- DELETE -->
 			<NcActionButton v-if="canManageElement(table)"
 				icon="icon-delete"
 				:close-after-click="true"
@@ -78,12 +131,17 @@
 			:show-share-sender="false" />
 	</NcAppNavigationItem>
 </template>
+
 <script>
 import { NcActionButton, NcAppNavigationItem, NcCounterBubble, NcAvatar } from '@nextcloud/vue'
 import '@nextcloud/dialogs/dist/index.css'
 import { mapGetters, mapState } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
 import Table from 'vue-material-design-icons/Table.vue'
+import Star from 'vue-material-design-icons/Star.vue'
+import StarOutline from 'vue-material-design-icons/StarOutline.vue'
+import ArchiveArrowDown from 'vue-material-design-icons/ArchiveArrowDown.vue'
+import ArchiveArrowUpOutline from 'vue-material-design-icons/ArchiveArrowUpOutline.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import { getCurrentUser } from '@nextcloud/auth'
 import Connection from 'vue-material-design-icons/Connection.vue'
@@ -98,6 +156,10 @@ export default {
 		IconRename,
 		// eslint-disable-next-line vue/no-reserved-component-names
 		Table,
+		Star,
+		StarOutline,
+		ArchiveArrowDown,
+		ArchiveArrowUpOutline,
 		Import,
 		NavigationViewItem,
 		NcActionButton,
@@ -193,8 +255,24 @@ export default {
 				})
 			}
 		},
+		async toggleArchiveTable(archived) {
+			await this.$store.dispatch('updateTable', {
+				id: this.table.id,
+				data: { archived },
+			})
+		},
+		async toggleFavoriteTable(favorite) {
+			if (favorite) {
+				await this.$store.dispatch('favoriteTable', {
+					id: this.table.id,
+				})
+			} else {
+				await this.$store.dispatch('removeFavoriteTable', {
+					id: this.table.id,
+				})
+			}
+		},
 	},
-
 }
 </script>
 <style lang="scss">
diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
index 0d65bd912..6833c3bcf 100644
--- a/src/modules/navigation/partials/NavigationViewItem.vue
+++ b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -19,10 +19,11 @@
 			</NcCounterBubble>
 			<NcActionButton v-if="view.hasShares" icon="icon-share" :class="{'margin-right': !(activeView && view.id === activeView.id)}" @click="actionShowShare" />
 			<div v-if="view.isShared && view.ownership !== userId && !canManageTable(view) && showShareSender" class="margin-left">
-				<NcAvatar :user="view.ownership" />
+				<NcAvatar :user="view.ownership" :show-user-status="false" />
 			</div>
 		</template>
 		<template #actions>
+			<!-- EDIT -->
 			<NcActionButton v-if="canManageElement(view)"
 				:close-after-click="true"
 				@click="editView">
@@ -31,6 +32,8 @@
 				</template>
 				{{ t('tables', 'Edit view') }}
 			</NcActionButton>
+
+			<!-- DUPLICATE -->
 			<NcActionButton v-if="canManageTable(view)"
 				:close-after-click="true"
 				@click="cloneView">
@@ -39,12 +42,16 @@
 				</template>
 				{{ t('tables', 'Duplicate view') }}
 			</NcActionButton>
+
+			<!-- SHARE -->
 			<NcActionButton v-if="canShareElement(view)"
 				icon="icon-share"
 				:close-after-click="true"
 				@click="actionShowShare">
 				{{ t('tables', 'Share') }}
 			</NcActionButton>
+
+			<!-- IMPORT -->
 			<NcActionButton v-if="canCreateRowInElement(view)"
 				:close-after-click="true"
 				@click="actionShowImport(view)">
@@ -53,6 +60,8 @@
 					<Import :size="20" />
 				</template>
 			</NcActionButton>
+
+			<!-- INTEGRATION -->
 			<NcActionButton
 				:close-after-click="true"
 				@click="actionShowIntegration">
@@ -61,6 +70,28 @@
 					<Connection :size="20" />
 				</template>
 			</NcActionButton>
+
+			<!-- FAVORITE -->
+			<NcActionButton v-if="!view.favorite"
+				:close-after-click="true"
+				@click="toggleFavoriteView(true)">
+				{{ t('tables', 'Add to favorites') }}
+				<template #icon>
+					<Star :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- UNFAVORITE -->
+			<NcActionButton v-if="view.favorite"
+				:close-after-click="true"
+				@click="toggleFavoriteView(false)">
+				{{ t('tables', 'Remove from favorites') }}
+				<template #icon>
+					<StarOutline :size="20" />
+				</template>
+			</NcActionButton>
+
+			<!-- DELETE -->
 			<NcActionButton v-if="canManageElement(view)"
 				icon="icon-delete"
 				:close-after-click="true"
@@ -77,6 +108,8 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { mapGetters } from 'vuex'
 import { showError } from '@nextcloud/dialogs'
 import Table from 'vue-material-design-icons/Table.vue'
+import Star from 'vue-material-design-icons/Star.vue'
+import StarOutline from 'vue-material-design-icons/StarOutline.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import Connection from 'vue-material-design-icons/Connection.vue'
 import PlaylistPlay from 'vue-material-design-icons/PlaylistPlay.vue'
@@ -91,6 +124,8 @@ export default {
 		PlaylistEdit,
 		// eslint-disable-next-line vue/no-reserved-component-names
 		Table,
+		Star,
+		StarOutline,
 		NcAppNavigationItem,
 		NcCounterBubble,
 		NcActionButton,
@@ -180,6 +215,17 @@ export default {
 				showError(t('tables', 'Could not create new view'))
 			}
 		},
+		async toggleFavoriteView(favorite) {
+			if (favorite) {
+				await this.$store.dispatch('favoriteView', {
+					id: this.view.id,
+				})
+			} else {
+				await this.$store.dispatch('removeFavoriteView', {
+					id: this.view.id,
+				})
+			}
+		},
 	},
 
 }
diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
index ebb62720d..6985b5071 100644
--- a/src/modules/navigation/sections/Navigation.vue
+++ b/src/modules/navigation/sections/Navigation.vue
@@ -14,50 +14,95 @@
 			<div v-if="tablesLoading" class="icon-loading" />
 
 			<ul v-if="!tablesLoading">
-				<NcAppNavigationCaption :name="t('tables', 'My tables')">
+				<NcAppNavigationCaption v-if="getFavoriteNodes.length > 0"
+					:name="t('tables', 'Favorites')" />
+
+				<!-- FAVORITES -->
+				<template v-for="node in getFavoriteNodes">
+					<NavigationTableItem v-if="!node.tableId"
+						:key="node.id"
+						:filter-string="filterString"
+						:table="node" />
+
+					<NavigationViewItem v-else
+						:key="'view' + node.id"
+						:view="node" />
+				</template>
+
+				<NcAppNavigationCaption :name="t('tables', 'Tables')">
 					<template #actions>
 						<NcActionButton :aria-label="t('tables', 'Create table')" icon="icon-add" @click.prevent="createTable" />
 					</template>
 				</NcAppNavigationCaption>
-				<NavigationTableItem v-for="table in getOwnTables"
-					:key="table.id"
-					:filter-string="filterString"
-					:table="table" />
-
-				<NcAppNavigationCaption v-if="getSharedTables.length > 0 || getSharedViews.length > 0"
-					:name="t('tables', 'Shared')" />
-				<NavigationTableItem v-for="table in getSharedTables"
-					:key="table.id"
-					:filter-string="filterString"
-					:table="table" />
-				<NavigationViewItem v-for="view in getSharedViews"
-					:key="'view'+view.id"
-					:view="view" />
-			</ul>
 
-			<div v-if="filterString !== ''" class="search-info">
-				<NcEmptyContent :description="t('tables', 'Your results are filtered.')">
+				<!-- ALL NON-FAVORITES -->
+				<template v-for="node in getAllNodes">
+					<NavigationTableItem v-if="!node.tableId && !node.archived && !node.favorite"
+						:key="node.id"
+						:filter-string="filterString"
+						:table="node" />
+
+					<NavigationViewItem v-else-if="node.tableId && !node.favorite && !viewAlreadyListed(node)"
+						:key="'view' + node.id"
+						:view="node" />
+				</template>
+
+				<!-- ARCHIVED -->
+				<NcAppNavigationItem v-if="getArchivedTables.length > 0"
+					:name="t('tables', 'Archived tables')"
+					:allow-collapse="true"
+					:open="false">
 					<template #icon>
-						<Magnify :size="10" />
+						<Archive :size="20" />
 					</template>
-					<template #action>
-						<NcButton :aria-label="t('tables', 'Clear filter')" @click="filterString = ''">
-							{{ t('tables', 'Clear filter') }}
-						</NcButton>
+
+					<template #counter>
+						<NcCounterBubble>
+							{{ getArchivedTables.length }}
+						</NcCounterBubble>
 					</template>
-				</NcEmptyContent>
-			</div>
+
+					<NavigationTableItem v-for="table in getArchivedTables"
+						:key="table.id"
+						:filter-string="filterString"
+						:table="table" />
+				</NcAppNavigationItem>
+			</ul>
 		</template>
+
+		<div v-if="filterString !== ''" class="search-info">
+			<NcEmptyContent :description="t('tables', 'Your results are filtered.')">
+				<template #icon>
+					<Magnify :size="10" />
+				</template>
+				<template #action>
+					<NcButton :aria-label="t('tables', 'Clear filter')" @click="filterString = ''">
+						{{ t('tables', 'Clear filter') }}
+					</NcButton>
+				</template>
+			</NcEmptyContent>
+		</div>
 	</NcAppNavigation>
 </template>
 
 <script>
-import { NcAppNavigation, NcAppNavigationCaption, NcActionButton, NcTextField, NcButton, NcEmptyContent } from '@nextcloud/vue'
+import {
+	NcAppNavigation,
+	NcAppNavigationItem,
+	NcAppNavigationCaption,
+	NcActionButton,
+	NcTextField,
+	NcButton,
+	NcEmptyContent,
+	NcCounterBubble,
+} from '@nextcloud/vue'
+
 import NavigationViewItem from '../partials/NavigationViewItem.vue'
 import NavigationTableItem from '../partials/NavigationTableItem.vue'
 import { mapState } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
+import Archive from 'vue-material-design-icons/Archive.vue'
 import { getCurrentUser } from '@nextcloud/auth'
 
 export default {
@@ -66,11 +111,14 @@ export default {
 		NavigationTableItem,
 		NavigationViewItem,
 		NcAppNavigation,
+		NcAppNavigationItem,
 		NcAppNavigationCaption,
 		NcActionButton,
 		NcTextField,
 		Magnify,
+		Archive,
 		NcButton,
+		NcCounterBubble,
 		NcEmptyContent,
 	},
 	data() {
@@ -81,15 +129,28 @@ export default {
 	},
 	computed: {
 		...mapState(['tables', 'views', 'tablesLoading']),
+		getAllNodes() {
+			return [...this.getFilteredTables, ...this.getOwnViews, ...this.getSharedViews]
+		},
+		getOwnViews() {
+			const sharedTableIds = this.getFilteredTables.map(table => table.id)
+
+			return this.views.filter(view => {
+				return !view.isShared && view.ownership === getCurrentUser().uid && sharedTableIds.includes(view.tableId)
+			}).filter(view => view.title.toLowerCase().includes(this.filterString.toLowerCase()))
+		},
 		getSharedViews() {
 			const sharedTableIds = this.getFilteredTables.map(table => table.id)
-			return this.views.filter(item => item.isShared === true && item.ownership !== getCurrentUser().uid && !sharedTableIds.includes(item.tableId)).filter(view => view.title.toLowerCase().includes(this.filterString.toLowerCase())).sort((a, b) => a.tableId === b.tableId ? a.id - b.id : a.tableId - b.tableId)
+
+			return this.views.filter(view => {
+				return view.isShared && view.ownership !== getCurrentUser().uid && !sharedTableIds.includes(view.tableId)
+			}).filter(view => view.title.toLowerCase().includes(this.filterString.toLowerCase()))
 		},
-		getSharedTables() {
-			return this.getFilteredTables.filter((item) => { return item.isShared === true && item.ownership !== getCurrentUser().uid }).sort((a, b) => a.title.localeCompare(b.title))
+		getFavoriteNodes() {
+			return this.getAllNodes.filter(node => node.favorite)
 		},
-		getOwnTables() {
-			return this.getFilteredTables.filter((item) => { return item.isShared === false || item.ownership === getCurrentUser().uid }).sort((a, b) => a.title.localeCompare(b.title))
+		getArchivedTables() {
+			return this.getFilteredTables.filter(node => node.archived)
 		},
 		getFilteredTables() {
 			return this.tables.filter(table => {
@@ -113,6 +174,9 @@ export default {
 				})
 			}
 		},
+		viewAlreadyListed(view) {
+			return this.getFilteredTables.map(t => t.id).includes(view.tableId)
+		},
 	},
 }
 </script>
diff --git a/src/shared/constants.js b/src/shared/constants.js
new file mode 100644
index 000000000..5092fae81
--- /dev/null
+++ b/src/shared/constants.js
@@ -0,0 +1,23 @@
+/*
+ * @copyright Copyright (c) 2024 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export const NODE_TYPE_TABLE = 0
+export const NODE_TYPE_VIEW = 1
diff --git a/src/store/store.js b/src/store/store.js
index 1d2a862ae..8245baba1 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -6,6 +6,7 @@ import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/dist/index.css'
 import data from './data.js'
 import displayError from '../shared/utils/displayError.js'
+import { NODE_TYPE_TABLE, NODE_TYPE_VIEW } from '../shared/constants.js'
 
 Vue.use(Vuex)
 
@@ -234,6 +235,66 @@ export default new Vuex.Store({
 			commit('setTables', [...tables])
 			return true
 		},
+		async favoriteView({ state, commit, dispatch }, { id }) {
+			try {
+				await axios.post(generateOcsUrl(`/apps/tables/api/2/favorites/${NODE_TYPE_VIEW}/${id}`))
+			} catch (e) {
+				displayError(e, t('tables', 'Could not favorite view'))
+				return false
+			}
+
+			const index = state.views.findIndex(v => v.id === id)
+			const view = state.views[index]
+			view.favorite = true
+			commit('setView', view)
+
+			return true
+		},
+		async removeFavoriteView({ state, commit, dispatch }, { id }) {
+			try {
+				await axios.delete(generateOcsUrl(`/apps/tables/api/2/favorites/${NODE_TYPE_VIEW}/${id}`))
+			} catch (e) {
+				displayError(e, t('tables', 'Could not remove view from favorites'))
+				return false
+			}
+
+			const index = state.views.findIndex(v => v.id === id)
+			const view = state.views[index]
+			view.favorite = false
+			commit('setView', view)
+
+			return true
+		},
+		async favoriteTable({ state, commit, dispatch }, { id }) {
+			try {
+				await axios.post(generateOcsUrl(`/apps/tables/api/2/favorites/${NODE_TYPE_TABLE}/${id}`))
+			} catch (e) {
+				displayError(e, t('tables', 'Could not favorite table'))
+				return false
+			}
+
+			const index = state.tables.findIndex(t => t.id === id)
+			const table = state.tables[index]
+			table.favorite = true
+			commit('setTable', table)
+
+			return true
+		},
+		async removeFavoriteTable({ state, commit, dispatch }, { id }) {
+			try {
+				await axios.delete(generateOcsUrl(`/apps/tables/api/2/favorites/${NODE_TYPE_TABLE}/${id}`))
+			} catch (e) {
+				displayError(e, t('tables', 'Could not remove table from favorites'))
+				return false
+			}
+
+			const index = state.tables.findIndex(t => t.id === id)
+			const table = state.tables[index]
+			table.favorite = false
+			commit('setTable', table)
+
+			return true
+		},
 		async transferTable({ state, commit, dispatch }, { id, data }) {
 			try {
 				await axios.put(generateOcsUrl('/apps/tables/api/2/tables/' + id + '/transfer'), data)
diff --git a/tests/integration/features/APIv2.feature b/tests/integration/features/APIv2.feature
index 7afbabba7..1848ce77e 100644
--- a/tests/integration/features/APIv2.feature
+++ b/tests/integration/features/APIv2.feature
@@ -2,6 +2,7 @@ Feature: APIv2
   Background:
     Given user "participant1-v2" exists
     Given user "participant2-v2" exists
+    Given user "participant3-v2" exists
 
   @api2
   Scenario: Test initial setup
@@ -15,11 +16,37 @@ Feature: APIv2
     Given table "Table 1 via api v2" with emoji "👋" exists for user "participant1-v2" as "t1" via v2
     Then user "participant1-v2" has the following tables via v2
       | Table 1 via api v2 |
+    And user "participant1-v2" sees the following table attributes on table "t1"
+      | archived | 0 |
     Then user "participant1-v2" updates table "t1" set title "updated title" and emoji "⛵︎" via v2
     Then user "participant1-v2" has the following tables via v2
       | updated title |
+    Then user "participant1-v2" updates table "t1" set archived 1 via v2
+    And user "participant1-v2" sees the following table attributes on table "t1"
+      | archived | 1 |
+    Then user "participant1-v2" updates table "t1" set archived 0 via v2
+    And user "participant1-v2" sees the following table attributes on table "t1"
+      | archived | 0 |
     Then user "participant1-v2" deletes table "t1" via v2
 
+  @api2
+  Scenario: Favorite tables
+    Given table "Own table" with emoji "👋" exists for user "participant1-v2" as "t1" via v2
+    And user "participant1-v2" shares table with user "participant2-v2"
+    And user "participant1-v2" adds the table "t1" to favorites
+    And user "participant1-v2" sees the following table attributes on table "t1"
+      | favorite | 1 |
+    And user "participant2-v2" fetches table info for table "t1"
+    And user "participant2-v2" sees the following table attributes on table "t1"
+      | favorite | 0 |
+    When user "participant1-v2" removes the table "t1" from favorites
+    And user "participant1-v2" sees the following table attributes on table "t1"
+      | favorite | 0 |
+    When user "participant3-v2" adds the table "t1" to favorites
+    Then the last response should have a "403" status code
+
+
+
   @api2
   Scenario: Basic column actions
     Given table "Table 2" with emoji "👋" exists for user "participant1-v2" as "t2" via v2
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 959cbc870..7a4757e24 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -70,6 +70,10 @@ class FeatureContext implements Context {
 	private array $viewIds = [];
 	private array $columnIds = [];
 
+	// Store data from last request to perform assertions, id is used as a key
+	private array $tableData = [];
+	private array $viewData = [];
+
 	// use CommandLineTrait;
 
 	/**
@@ -127,16 +131,30 @@ public function createTableV2(string $user, string $title, string $tableName, st
 		Assert::assertEquals($newTable['emoji'], $emoji);
 		Assert::assertEquals($newTable['ownership'], $user);
 
+		$tableToVerify = $this->userFetchesTableInfo($user, $tableName);
+		Assert::assertEquals(200, $this->response->getStatusCode());
+		Assert::assertEquals($tableToVerify['title'], $title);
+		Assert::assertEquals($tableToVerify['emoji'], $emoji);
+		Assert::assertEquals($tableToVerify['ownership'], $user);
+	}
+
+	/**
+	 * @Given user :user fetches table info for table :tableName
+	 */
+	public function userFetchesTableInfo($user, $tableName) {
+		$this->setCurrentUser($user);
+		$tableId = $this->tableIds[$tableName];
+
 		$this->sendOcsRequest(
 			'GET',
-			'/apps/tables/api/2/tables/'.$newTable['id'],
+			'/apps/tables/api/2/tables/'.$tableId,
 		);
 
 		$tableToVerify = $this->getDataFromResponse($this->response)['ocs']['data'];
-		Assert::assertEquals(200, $this->response->getStatusCode());
-		Assert::assertEquals($tableToVerify['title'], $title);
-		Assert::assertEquals($tableToVerify['emoji'], $emoji);
-		Assert::assertEquals($tableToVerify['ownership'], $user);
+		$this->tableData[$tableName] = $tableToVerify;
+		$this->tableId = $tableToVerify['id'];
+
+		return $tableToVerify;
 	}
 
 	/**
@@ -223,6 +241,7 @@ public function initialResourcesV2(string $user, TableNode $body = null): void {
 
 	/**
 	 * @Then user :user updates table :tableName set title :title and emoji :emoji via v2
+	 * @Then user :user updates table :tableName set archived :archived via v2
 	 *
 	 * @param string $user
 	 * @param string $title
@@ -230,13 +249,26 @@ public function initialResourcesV2(string $user, TableNode $body = null): void {
 	 * @param string $tableName
 	 * @throws Exception
 	 */
-	public function updateTableV2(string $user, string $title, ?string $emoji, string $tableName): void {
+	public function updateTableV2(string $user, string $tableName, string $title = null, ?string $emoji = null, ?bool $archived = null): void {
 		$this->setCurrentUser($user);
 
-		$data = ['title' => $title];
+		$this->sendOcsRequest(
+			'GET',
+			'/apps/tables/api/2/tables/'.$this->tableIds[$tableName],
+		);
+
+		$previousData = $this->getDataFromResponse($this->response)['ocs']['data'];
+
+		$data = [];
+		if ($title !== null) {
+			$data['title'] = $title;
+		}
 		if ($emoji !== null) {
 			$data['emoji'] = $emoji;
 		}
+		if ($archived !== null) {
+			$data['archived'] = $archived;
+		}
 
 		$this->sendOcsRequest(
 			'PUT',
@@ -247,9 +279,10 @@ public function updateTableV2(string $user, string $title, ?string $emoji, strin
 		$updatedTable = $this->getDataFromResponse($this->response)['ocs']['data'];
 
 		Assert::assertEquals(200, $this->response->getStatusCode());
-		Assert::assertEquals($updatedTable['title'], $title);
-		Assert::assertEquals($updatedTable['emoji'], $emoji);
-		Assert::assertEquals($updatedTable['ownership'], $user);
+		Assert::assertEquals($updatedTable['title'], $title ?? $previousData['title']);
+		Assert::assertEquals($updatedTable['emoji'], $emoji ?? $previousData['emoji']);
+		Assert::assertEquals($updatedTable['ownership'], $user ?? $previousData['ownership']);
+		Assert::assertEquals($updatedTable['archived'], $archived ?? $previousData['archived']);
 
 		$this->sendOcsRequest(
 			'GET',
@@ -258,9 +291,12 @@ public function updateTableV2(string $user, string $title, ?string $emoji, strin
 
 		$tableToVerify = $this->getDataFromResponse($this->response)['ocs']['data'];
 		Assert::assertEquals(200, $this->response->getStatusCode());
-		Assert::assertEquals($tableToVerify['title'], $title);
-		Assert::assertEquals($tableToVerify['emoji'], $emoji);
-		Assert::assertEquals($tableToVerify['ownership'], $user);
+		Assert::assertEquals($tableToVerify['title'], $title ?? $previousData['title']);
+		Assert::assertEquals($tableToVerify['emoji'], $emoji ?? $previousData['emoji']);
+		Assert::assertEquals($tableToVerify['ownership'], $user ?? $previousData['ownership']);
+		Assert::assertEquals($tableToVerify['archived'], $archived ?? $previousData['archived']);
+
+		$this->tableData[$tableName] = $tableToVerify;
 	}
 
 	/**
@@ -1634,4 +1670,59 @@ protected function assertStatusCode(ResponseInterface $response, int $statusCode
 			Assert::assertEquals($statusCode, $response->getStatusCode(), $message);
 		}
 	}
+
+	/**
+	 * @Given user :user sees the following table attributes on table :tableName
+	 */
+	public function userSeesTheFollowingTableAttributesOnTable($user, $tableName, TableNode $table) {
+		foreach ($table->getRows() as $row) {
+			$attribute = $row[0];
+			$value = $row[1];
+			if (in_array($attribute, ['archived', 'favorite'])) {
+				$value = (bool)$value;
+			}
+			Assert::assertEquals($value, $this->tableData[$tableName][$attribute]);
+		}
+	}
+
+	/**
+	 * @Given user :user adds the table :tableName to favorites
+	 */
+	public function userAddsTheTableToFavorites($user, $tableName) {
+		$this->setCurrentUser($user);
+		$nodeType = 0;
+		$tableId = $this->tableIds[$tableName];
+
+		$this->sendOcsRequest(
+			'POST',
+			'/apps/tables/api/2/favorites/' . $nodeType. '/' . $tableId,
+		);
+		if ($this->response->getStatusCode() === 200) {
+			$this->userFetchesTableInfo($user, $tableName);
+		}
+	}
+
+	/**
+	 * @Given user :user removes the table :tableName from favorites
+	 */
+	public function userRemovesTheTableFromFavorites($user, $tableName) {
+		$this->setCurrentUser($user);
+		$nodeType = 0;
+		$tableId = $this->tableIds[$tableName];
+
+		$this->sendOcsRequest(
+			'DELETE',
+			'/apps/tables/api/2/favorites/' . $nodeType. '/' . $tableId,
+		);
+		if ($this->response->getStatusCode() === 200) {
+			$this->userFetchesTableInfo($user, $tableName);
+		}
+	}
+
+	/**
+	 * @Then /^the last response should have a "([^"]*)" status code$/
+	 */
+	public function theLastResponseShouldHaveAStatusCode(int $statusCode) {
+		Assert::assertEquals($statusCode, $this->response->getStatusCode());
+	}
 }