diff --git a/src/Chunk/AnvilChunk.php b/src/Chunk/AnvilChunk.php
index b0c8b9f..32e6f7a 100644
--- a/src/Chunk/AnvilChunk.php
+++ b/src/Chunk/AnvilChunk.php
@@ -2,7 +2,6 @@
 
 namespace Aternos\Thanos\Chunk;
 
-use Aternos\Thanos\Reader\CustomCompressionReader;
 use Aternos\Thanos\Reader\LZ4BlockReader;
 use Aternos\Thanos\Reader\RawReader;
 use Aternos\Thanos\Reader\ReaderInterface;
@@ -38,6 +37,11 @@ class AnvilChunk implements ChunkInterface
      */
     protected int $length;
 
+    /**
+     * @var int
+     */
+    protected int $dataLength;
+
     /**
      * @var int
      */
@@ -111,48 +115,51 @@ public function __construct($file, int $offset, array $regionPosition, int $regi
 
         $this->readHeader();
 
-        $dataLength = $this->length - 5;
-        switch ($this->compression) {
-            case 1:
-                $this->reader = new ZlibReader(
-                    $this->file,
-                    ZLIB_ENCODING_GZIP,
-                    $this->dataOffset,
-                    $dataLength
-                );
-                break;
-            case 2:
-                $this->reader = new ZlibReader(
-                    $this->file,
-                    ZLIB_ENCODING_DEFLATE,
-                    $this->dataOffset,
-                    $dataLength
-                );
-                break;
-            case 3:
-                $this->reader = new RawReader(
-                    $this->file,
-                    $this->dataOffset,
-                    $dataLength
-                );
-                break;
-            case 4:
-                $this->reader = new LZ4BlockReader(
-                    $this->file,
-                    $this->dataOffset,
-                    $dataLength
-                );
-                break;
-            case 127:
-                $this->reader = new CustomCompressionReader(
-                    $this->file,
-                    $this->dataOffset,
-                    $dataLength
-                );
-                break;
-            default:
-                throw new Exception("Unknown chunk compression type.");
-        }
+        $this->reader = $this->createReader();
+    }
+
+    /**
+     * @return ReaderInterface
+     * @throws Exception
+     */
+    protected function createReader(): ReaderInterface
+    {
+        return match ($this->compression) {
+            1 => new ZlibReader(
+                $this->file,
+                ZLIB_ENCODING_GZIP,
+                $this->dataOffset,
+                $this->dataLength
+            ),
+            2 => new ZlibReader(
+                $this->file,
+                ZLIB_ENCODING_DEFLATE,
+                $this->dataOffset,
+                $this->dataLength
+            ),
+            3 => new RawReader(
+                $this->file,
+                $this->dataOffset,
+                $this->dataLength
+            ),
+            4 => new LZ4BlockReader(
+                $this->file,
+                $this->dataOffset,
+                $this->dataLength
+            ),
+            127 => $this->getCustomReader($this->readCustomCompressionName()),
+            default => throw new Exception("Unknown chunk compression type."),
+        };
+    }
+
+    /**
+     * @param string $name
+     * @return ReaderInterface
+     * @throws Exception
+     */
+    protected function getCustomReader(string $name): ReaderInterface
+    {
+        throw new Exception("Unsupported custom compression type: " . $name);
     }
 
     /**
@@ -167,6 +174,7 @@ protected function readHeader(): void
             throw new Exception("Failed to read chunk length.");
         }
         $this->length = $rawValue['1'] + 4;
+        $this->dataLength = $this->length - 5;
 
         $rawValue = unpack('C', fread($this->file, 1));
         if ($rawValue === false) {
@@ -175,6 +183,19 @@ protected function readHeader(): void
         $this->compression = $rawValue['1'];
     }
 
+    /**
+     * @return string
+     * @throws Exception
+     */
+    protected function readCustomCompressionName(): string
+    {
+        $name = stream_get_line($this->file, $this->dataLength, "\x00");
+        if ($name === false) {
+            throw new Exception("Failed to read custom compression name.");
+        }
+        return $name;
+    }
+
     /**
      * Get offset of chunk data within the region file
      *
diff --git a/src/Reader/CustomCompressionReader.php b/src/Reader/CustomCompressionReader.php
deleted file mode 100644
index 2725871..0000000
--- a/src/Reader/CustomCompressionReader.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Aternos\Thanos\Reader;
-
-use Exception;
-
-class CustomCompressionReader extends BufferedReader
-{
-    protected string $compressionType;
-
-    /**
-     * @inheritDoc
-     * @throws Exception
-     */
-    public function __construct($resource, int $offset, int $length)
-    {
-        parent::__construct($resource, $offset, $length);
-
-        $this->compressionType = $this->readCompressionType();
-        throw new Exception("Unsupported custom compression type: " . $this->compressionType);
-    }
-
-    /**
-     * @return string
-     * @throws Exception
-     */
-    protected function readCompressionType(): string
-    {
-        $result = "";
-        while ($char = $this->readRaw(1)) {
-            if (ord($char) !== 0) {
-                break;
-            }
-            $result .= $char;
-        }
-        return $result;
-    }
-
-    /**
-     * @inheritDoc
-     * @throws Exception
-     */
-    protected function getRawChunk(int $length): string
-    {
-        return $this->readRaw($length);
-    }
-}