diff --git a/src/Services/LogSystem/TimeTravel.php b/src/Services/LogSystem/TimeTravel.php
index 37209415..5b02653f 100644
--- a/src/Services/LogSystem/TimeTravel.php
+++ b/src/Services/LogSystem/TimeTravel.php
@@ -40,8 +40,8 @@ use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\MappingException;
 use Exception;
 use InvalidArgumentException;
-use PHPUnit\Util\Type;
 use ReflectionClass;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 class TimeTravel
 {
@@ -56,8 +56,11 @@ class TimeTravel
     /**
      * Undeletes the element with the given ID.
      *
+     * @template T of AbstractDBElement
      * @param string $class The class name of the element that should be undeleted
+     * @phpstan-param class-string<T> $class
      * @param int    $id    the ID of the element that should be undeleted
+     * @phpstan-return T
      */
     public function undeleteEntity(string $class, int $id): AbstractDBElement
     {
@@ -215,14 +218,14 @@ class TimeTravel
         foreach ($old_data as $field => $data) {
             if ($metadata->hasField($field)) {
                 //We need to convert the string to a BigDecimal first
-                if (!$data instanceof BigDecimal && ('big_decimal' === $metadata->getFieldMapping($field)['type'])) {
+                if (!$data instanceof BigDecimal && ('big_decimal' === $metadata->getFieldMapping($field)->type)) {
                     $data = BigDecimal::of($data);
                 }
 
                 if (!$data instanceof \DateTimeInterface
-                    && (in_array($metadata->getFieldMapping($field)['type'],
+                    && (in_array($metadata->getFieldMapping($field)->type,
                         [Types::DATETIME_IMMUTABLE, Types::DATETIME_IMMUTABLE, Types::DATE_MUTABLE, Types::DATETIME_IMMUTABLE], true))) {
-                    $data = $this->dateTimeDecode($data, $metadata->getFieldMapping($field)['type']);
+                    $data = $this->dateTimeDecode($data, $metadata->getFieldMapping($field)->type);
                 }
 
                 $this->setField($element, $field, $data);
@@ -254,8 +257,20 @@ class TimeTravel
      */
     protected function setField(AbstractDBElement $element, string $field, mixed $new_value): void
     {
-        $reflection = new ReflectionClass($element::class);
-        $property = $reflection->getProperty($field);
+        //If the field name contains a dot, it is a embeddedable object and we need to split the field name
+        if (str_contains($field, '.')) {
+            [$embedded, $embedded_field] = explode('.', $field);
+
+            $elementClass = new ReflectionClass($element::class);
+            $property = $elementClass->getProperty($embedded);
+            $embeddedClass = $property->getValue($element);
+
+            $embeddedReflection = new ReflectionClass($embeddedClass::class);
+            $property = $embeddedReflection->getProperty($embedded_field);
+        } else {
+            $reflection = new ReflectionClass($element::class);
+            $property = $reflection->getProperty($field);
+        }
 
         //Check if the property is an BackedEnum, then convert the int or float value to an enum instance
         if ((is_string($new_value) || is_int($new_value))
diff --git a/tests/Services/LogSystem/TimeTravelTest.php b/tests/Services/LogSystem/TimeTravelTest.php
new file mode 100644
index 00000000..f8e9c088
--- /dev/null
+++ b/tests/Services/LogSystem/TimeTravelTest.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Tests\Services\LogSystem;
+
+use App\Entity\LogSystem\ElementEditedLogEntry;
+use App\Entity\Parts\Category;
+use App\Services\LogSystem\TimeTravel;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class TimeTravelTest extends KernelTestCase
+{
+
+    private TimeTravel $service;
+    private EntityManagerInterface $em;
+
+    public function setUp(): void
+    {
+        self::bootKernel();
+        $this->service = self::getContainer()->get(TimeTravel::class);
+        $this->em = self::getContainer()->get(EntityManagerInterface::class);
+    }
+
+    public function testUndeleteEntity(): void
+    {
+        $undeletedCategory = $this->service->undeleteEntity(Category::class, 100);
+
+        $this->assertInstanceOf(Category::class, $undeletedCategory);
+        $this->assertEquals(100, $undeletedCategory->getId());
+    }
+
+    public function testApplyEntry(): void
+    {
+        $category = new Category();
+        //Fake an ID
+        $reflClass = new \ReflectionClass($category);
+        $reflClass->getProperty('id')->setValue($category, 1000);
+
+        $category->setName('Test Category');
+        $category->setComment('Test Comment');
+
+        $logEntry = new ElementEditedLogEntry($category);
+        $logEntry->setOldData(['name' => 'Old Category', 'comment' => 'Old Comment']);
+
+        $this->service->applyEntry($category, $logEntry);
+
+        $this->assertEquals('Old Category', $category->getName());
+        $this->assertEquals('Old Comment', $category->getComment());
+    }
+
+    public function testRevertEntityToTimestamp(): void
+    {
+        /** @var Category $category */
+        $category = $this->em->find(Category::class, 1);
+
+        $this->service->revertEntityToTimestamp($category, new \DateTime('2022-01-01 00:00:00'));
+
+        //The category with 1 should have the name 'Test' at this timestamp
+        $this->assertEquals('Test', $category->getName());
+    }
+}