diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php b/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php
new file mode 100644
index 000000000..b30713771
--- /dev/null
+++ b/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchemaBlockRemap.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\blockstate\upgrade;
+
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\Tag;
+use pocketmine\utils\Utils;
+
+final class BlockStateUpgradeSchemaBlockRemap{
+
+	public CompoundTag $oldState;
+	public CompoundTag $newState;
+
+	/**
+	 * @param Tag[] $oldState
+	 * @param Tag[] $newState
+	 * @phpstan-param array<string, Tag> $oldState
+	 * @phpstan-param array<string, Tag> $newState
+	 */
+	public function __construct(
+		array $oldState,
+		public string $newName,
+		array $newState
+	){
+		$this->oldState = CompoundTag::create();
+		$this->newState = CompoundTag::create();
+		foreach(Utils::stringifyKeys($oldState) as $k => $v){
+			$this->oldState->setTag($k, $v);
+		}
+		foreach(Utils::stringifyKeys($newState) as $k => $v){
+			$this->newState->setTag($k, $v);
+		}
+	}
+}
diff --git a/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php b/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php
new file mode 100644
index 000000000..5404c0bdc
--- /dev/null
+++ b/src/data/bedrock/blockstate/upgrade/model/BlockStateUpgradeSchemaModelBlockRemap.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\blockstate\upgrade\model;
+
+final class BlockStateUpgradeSchemaModelBlockRemap{
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelTag[]
+	 * @phpstan-var array<string, BlockStateUpgradeSchemaModelTag>
+	 * @required
+	 */
+	public array $oldState;
+
+	/** @required */
+	public string $newName;
+
+	/**
+	 * @var BlockStateUpgradeSchemaModelTag[]
+	 * @phpstan-var array<string, BlockStateUpgradeSchemaModelTag>
+	 * @required
+	 */
+	public array $newState;
+
+	/**
+	 * @param BlockStateUpgradeSchemaModelTag[] $oldState
+	 * @param BlockStateUpgradeSchemaModelTag[] $newState
+	 * @phpstan-param array<string, BlockStateUpgradeSchemaModelTag> $oldState
+	 * @phpstan-param array<string, BlockStateUpgradeSchemaModelTag> $newState
+	 */
+	public function __construct(array $oldState, string $newName, array $newState){
+		$this->oldState = $oldState;
+		$this->newName = $newName;
+		$this->newState = $newState;
+	}
+}