diff --git a/src/Entity/Parts/PartAssociation.php b/src/Entity/Parts/PartAssociation.php
index f47ecc4a..3ad86aaa 100644
--- a/src/Entity/Parts/PartAssociation.php
+++ b/src/Entity/Parts/PartAssociation.php
@@ -37,6 +37,7 @@ use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use App\ApiPlatform\Filter\LikeFilter;
+use App\Entity\Contracts\TimeStampableInterface;
 use App\Repository\DBElementRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
@@ -68,7 +69,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 #[ApiFilter(LikeFilter::class, properties: ["other_type", "comment"])]
 #[ApiFilter(DateFilter::class, strategy: DateFilter::EXCLUDE_NULL)]
 #[ApiFilter(OrderFilter::class, properties: ['comment', 'addedDate', 'lastModified'])]
-class PartAssociation extends AbstractDBElement
+class PartAssociation extends AbstractDBElement implements TimeStampableInterface
 {
     use TimestampTrait;
 
diff --git a/src/Entity/ProjectSystem/ProjectBOMEntry.php b/src/Entity/ProjectSystem/ProjectBOMEntry.php
index b45e1af0..745b19e9 100644
--- a/src/Entity/ProjectSystem/ProjectBOMEntry.php
+++ b/src/Entity/ProjectSystem/ProjectBOMEntry.php
@@ -35,6 +35,7 @@ use ApiPlatform\Metadata\Post;
 use ApiPlatform\OpenApi\Model\Operation;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use App\ApiPlatform\Filter\LikeFilter;
+use App\Entity\Contracts\TimeStampableInterface;
 use App\Validator\UniqueValidatableInterface;
 use Doctrine\DBAL\Types\Types;
 use App\Entity\Base\AbstractDBElement;
@@ -84,7 +85,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 #[ApiFilter(LikeFilter::class, properties: ["name", "comment", 'mountnames'])]
 #[ApiFilter(RangeFilter::class, properties: ['quantity'])]
 #[ApiFilter(OrderFilter::class, properties: ['name', 'id', 'addedDate', 'lastModified', 'quantity'])]
-class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInterface
+class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInterface, TimeStampableInterface
 {
     use TimestampTrait;
 
diff --git a/src/Entity/UserSystem/ApiToken.php b/src/Entity/UserSystem/ApiToken.php
index 95919e1d..b70a2167 100644
--- a/src/Entity/UserSystem/ApiToken.php
+++ b/src/Entity/UserSystem/ApiToken.php
@@ -30,6 +30,7 @@ use ApiPlatform\OpenApi\Model\Operation;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\Base\TimestampTrait;
+use App\Entity\Contracts\TimeStampableInterface;
 use App\Repository\UserSystem\ApiTokenRepository;
 use App\State\CurrentApiTokenProvider;
 use App\State\PartDBInfoProvider;
@@ -54,7 +55,7 @@ use Symfony\Component\Validator\Constraints\NotBlank;
     provider: CurrentApiTokenProvider::class,
 )]
 #[ApiFilter(PropertyFilter::class)]
-class ApiToken
+class ApiToken implements TimeStampableInterface
 {
 
     use TimestampTrait;
diff --git a/src/Entity/UserSystem/U2FKey.php b/src/Entity/UserSystem/U2FKey.php
index f6a2a2e4..4cd83fd6 100644
--- a/src/Entity/UserSystem/U2FKey.php
+++ b/src/Entity/UserSystem/U2FKey.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace App\Entity\UserSystem;
 
+use App\Entity\Contracts\TimeStampableInterface;
 use Doctrine\DBAL\Types\Types;
 use App\Entity\Base\TimestampTrait;
 use Doctrine\ORM\Mapping as ORM;
@@ -31,7 +32,7 @@ use Jbtronics\TFAWebauthn\Model\LegacyU2FKeyInterface;
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'u2f_keys')]
 #[ORM\UniqueConstraint(name: 'user_unique', columns: ['user_id', 'key_handle'])]
-class U2FKey implements LegacyU2FKeyInterface
+class U2FKey implements LegacyU2FKeyInterface, TimeStampableInterface
 {
     use TimestampTrait;
 
diff --git a/src/Entity/UserSystem/WebauthnKey.php b/src/Entity/UserSystem/WebauthnKey.php
index ee467bc3..42dc6d53 100644
--- a/src/Entity/UserSystem/WebauthnKey.php
+++ b/src/Entity/UserSystem/WebauthnKey.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
  */
 namespace App\Entity\UserSystem;
 
+use App\Entity\Contracts\TimeStampableInterface;
 use Doctrine\DBAL\Types\Types;
 use App\Entity\Base\TimestampTrait;
 use Doctrine\ORM\Mapping as ORM;
@@ -31,7 +32,7 @@ use Webauthn\PublicKeyCredentialSource as BasePublicKeyCredentialSource;
 #[ORM\Entity]
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'webauthn_keys')]
-class WebauthnKey extends BasePublicKeyCredentialSource
+class WebauthnKey extends BasePublicKeyCredentialSource implements TimeStampableInterface
 {
     use TimestampTrait;