diff --git a/mappings/net/minecraft/client/network/ClientNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientNetworkHandler.mapping
index 5a5fb78..7a7d47b 100644
--- a/mappings/net/minecraft/client/network/ClientNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientNetworkHandler.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_219 net/minecraft/client/network/ClientNetworkHandler
+	FIELD field_1968 clientPersistentStateManager Lnet/minecraft/class_53;
 	FIELD field_1969 random Ljava/util/Random;
 	FIELD field_1970 disconnected Z
 	FIELD field_1971 connection Lnet/minecraft/class_117;
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
new file mode 100644
index 0000000..1d31af1
--- /dev/null
+++ b/mappings/net/minecraft/item/map/MapState.mapping
@@ -0,0 +1,43 @@
+CLASS net/minecraft/class_198 net/minecraft/item/map/MapState
+	FIELD field_720 centerX I
+	FIELD field_721 centerZ I
+	FIELD field_722 dimension B
+	FIELD field_723 scale B
+	FIELD field_724 colors [B
+	FIELD field_725 inventoryTicks I
+	FIELD field_726 updateTrackers Ljava/util/List;
+	FIELD field_727 icons Ljava/util/List;
+	FIELD field_728 updateTrackersByPlayer Ljava/util/Map;
+	METHOD method_666 markDirty (III)V
+		ARG 1 x
+		ARG 2 startZ
+		ARG 3 endZ
+	METHOD method_667 update (Lnet/minecraft/class_54;Lnet/minecraft/class_31;)V
+		ARG 1 player
+		ARG 2 stack
+	METHOD method_668 getPlayerMarkerPacket (Lnet/minecraft/class_31;Lnet/minecraft/class_18;Lnet/minecraft/class_54;)[B
+		ARG 1 stack
+		ARG 2 world
+		ARG 3 player
+	METHOD method_669 readUpdateData ([B)V
+		ARG 1 updateData
+	CLASS class_199 MapIcon
+		FIELD field_729 type B
+		FIELD field_730 x B
+		FIELD field_731 z B
+		FIELD field_732 rotation B
+		METHOD <init> (Lnet/minecraft/class_198;BBBB)V
+			ARG 2 type
+			ARG 3 x
+			ARG 4 z
+			ARG 5 rotation
+	CLASS class_200 PlayerUpdateTracker
+		FIELD field_734 player Lnet/minecraft/class_54;
+		FIELD field_735 startZ [I
+		FIELD field_736 endZ [I
+		FIELD field_739 colorsUpdateInterval I
+		FIELD field_740 iconsData [B
+		METHOD <init> (Lnet/minecraft/class_198;Lnet/minecraft/class_54;)V
+			ARG 2 player
+		METHOD method_670 getUpdateData (Lnet/minecraft/class_31;)[B
+			ARG 1 stack
diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping
new file mode 100644
index 0000000..0c80d90
--- /dev/null
+++ b/mappings/net/minecraft/world/PersistentState.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_58 net/minecraft/world/PersistentState
+	FIELD field_574 id Ljava/lang/String;
+	FIELD field_575 dirty Z
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 id
+	METHOD method_544 markDirty ()V
+	METHOD method_545 readNbt (Lnet/minecraft/class_8;)V
+		ARG 1 nbt
+	METHOD method_546 setDirty (Z)V
+		ARG 1 dirty
+	METHOD method_547 isDirty ()Z
+	METHOD method_548 writeNbt (Lnet/minecraft/class_8;)V
+		ARG 1 nbt
diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping
new file mode 100644
index 0000000..6be76fc
--- /dev/null
+++ b/mappings/net/minecraft/world/PersistentStateManager.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_53 net/minecraft/world/PersistentStateManager
+	FIELD field_551 loadedStatesById Ljava/util/Map;
+	FIELD field_552 loadedStates Ljava/util/List;
+	FIELD field_553 idCounts Ljava/util/Map;
+	METHOD method_523 save ()V
+	METHOD method_524 save (Lnet/minecraft/class_58;)V
+		ARG 1 state
+	METHOD method_525 getOrCreate (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/class_58;
+		ARG 1 stateClass
+		ARG 2 id
+	METHOD method_526 getIdCount (Ljava/lang/String;)I
+		ARG 1 id
+	METHOD method_527 set (Ljava/lang/String;Lnet/minecraft/class_58;)V
+		ARG 1 id
+		ARG 2 state
+	METHOD method_528 loadIdCounts ()V
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 2037113..4cb0fc6 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_18 net/minecraft/world/World
 	FIELD field_180 isRemote Z
 	FIELD field_216 dimension Lnet/minecraft/class_50;
 	FIELD field_220 properties Lnet/minecraft/class_7;
+	FIELD field_222 persistentStateManager Lnet/minecraft/class_53;
 	METHOD <init> (Lnet/minecraft/class_18;Lnet/minecraft/class_50;)V
 		ARG 1 world
 		ARG 2 dimension
@@ -21,7 +22,15 @@ CLASS net/minecraft/class_18 net/minecraft/world/World
 		ARG 1 time
 	METHOD method_168 canSpawnEntity (Lnet/minecraft/class_25;)Z
 		ARG 1 box
+	METHOD method_176 getOrCreateState (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/class_58;
+		ARG 1 stateClass
+		ARG 2 id
 	METHOD method_178 addParticle (Ljava/lang/String;DDDDDD)V
+	METHOD method_180 setState (Ljava/lang/String;Lnet/minecraft/class_58;)V
+		ARG 1 id
+		ARG 2 state
+	METHOD method_208 getIdCount (Ljava/lang/String;)I
+		ARG 1 id
 	METHOD method_211 getEntities (Lnet/minecraft/class_57;Lnet/minecraft/class_25;)Ljava/util/List;
 	METHOD method_217 getChunkData (IIIIII)[B
 		ARG 1 x