diff --git a/guides/plugins/plugins/framework/data-handling/entities-via-attributes.md b/guides/plugins/plugins/framework/data-handling/entities-via-attributes.md
index 6599c8a49..8e466a852 100644
--- a/guides/plugins/plugins/framework/data-handling/entities-via-attributes.md
+++ b/guides/plugins/plugins/framework/data-handling/entities-via-attributes.md
@@ -7,18 +7,24 @@ nav:
 
 # Entities via attributes
 
-Since Shopware v6.6.3.0, it has been possible to register entities via PHP attributes. This guide will demonstrate the process.
+Since Shopware v6.6.3.0, it has been possible to register entities via PHP attributes.
+This guide will demonstrate the process.
 
 ## Define the entity
 
-First, you need to define your entity. This is done by creating a new class extending `Entity` and adding the `Entity` attribute to it. The `name` parameter denotes the name of the entity. It is required and must be unique.
+First, you need to define your entity.
+This is done by creating a new class extending `Entity` and adding the `Entity` attribute to it.
+The `name` parameter denotes the name of the entity. It is required and must be unique.
 
-You can also supply the entity collection class to use for this entity, by specifying the `collectionClass` parameter. The default `EntityCollection` class is used if none is specified.
+You can also supply the entity collection class to use for this entity, by specifying the `collectionClass` parameter.
+The default `EntityCollection` class is used if none is specified.
+Note: this is only possible since 6.6.9.0
 
-You have to define a primary key. The primary key is defined by adding the `PrimaryKey` attribute to a property. In theory, the primary key can be of any type, but it is recommended to use a `UUID`. 
+You have to define a primary key. The primary key is defined by adding the `PrimaryKey` attribute to a property.
+In theory, the primary key can be of any type, but it is recommended to use a `UUID`. 
 
 ```php
-<?php
+<?php declare(strict_types=1);
 
 namespace Examples;
 
@@ -34,11 +40,14 @@ class ExampleEntity extends Entity
 }
 ```
 
-This is the most basic entity definition. You can add more properties and attributes to the entity. For example, you can add the `Field` attribute to a property to define the type of the property.
+This is the most basic entity definition.
+You can add more properties and attributes to the entity.
+For example, you can add the `Field` attribute to a property to define the type of the property.
 
 ## Register the entity
 
-To register the entity, you have to add this class to the DI container in the `services.xml` file. This is done by adding the `shopware.entity` tag to the service definition. 
+To register the entity, you have to add this class to the DI container in the `services.xml` file.
+This is done by adding the `shopware.entity` tag to the service definition. 
 
 ```xml
 <service id="Shopware\Tests\Integration\Core\Framework\DataAbstractionLayer\fixture\ExampleEntity">
@@ -46,13 +55,26 @@ To register the entity, you have to add this class to the DI container in the `s
 </service>
 ```
 
-That's it. Your entity is registered and you can read and write data to it over the DAL. Using the tag, Shopware automatically registers an `EntityDefinition` and `EntityRepository` for the entity.
+That's it.
+Your entity is registered, and you can read and write data to it over the DAL.
+Using the tag, Shopware automatically registers an `EntityDefinition` and `EntityRepository` for the entity.
 
 ## Field Types
 
-To define more fields, you typically use the `Field` attribute. The `Field` attribute requires the `type` parameter, which is the type of the field. The type can be any of the `FieldType` constants. 
+To define more fields, you typically use the `Field` attribute.
+The `Field` attribute requires the `type` parameter, which is the type of the field.
+The type can be any of the `FieldType` constants. 
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
 
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
@@ -76,9 +98,28 @@ class ExampleEntity extends Entity
 
 All field types are defined in the [`FieldType`](https://github.com/shopware/shopware/blob/trunk/src/Core/Framework/DataAbstractionLayer/Attribute/FieldType.php) class.
 
-If you have a custom field type, you can also specify the FQCN of the field type.
+### Using field class directly
+
+It is also possible to directly define the field type with any class extending `\Shopware\Core\Framework\DataAbstractionLayer\Field\Field`.
+Use the fully qualified class name reference as value for the `type` parameter. 
+
+::: note
+This feature is available since Shopware 6.6.9.0.
+:::
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\PriceField;
+use Shopware\Core\Framework\DataAbstractionLayer\Pricing\PriceCollection;
+
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
 {
@@ -93,9 +134,24 @@ class ExampleEntity extends Entity
 }
 ```
 
-We also provide a list of special field types, which implement a specific behavior. They have their own PHP attribute class, for example the `AutoIncrement` or `ForeignKey` field. 
+### Special field types
+
+We also provide a list of special field types, which implement a specific behavior.
+They have their own PHP attribute class, for example the `AutoIncrement` or `ForeignKey` field. 
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\AutoIncrement;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\ForeignKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
 {
@@ -116,6 +172,19 @@ class ExampleEntity extends Entity
 If you want to store JSON data in a field with its own validation and serialization logic, you can use the `Serialized` attribute and define its own serializer class:
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Serialized;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+use Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\PriceFieldSerializer;
+use Shopware\Core\Framework\DataAbstractionLayer\Pricing\PriceCollection;
+
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
 {
@@ -130,11 +199,19 @@ class ExampleEntity extends Entity
 
 ## Custom Fields
 
-To allow custom fields, you can use the `EntityCustomFieldsTrait`. This gives you some helper methods to easily work with custom field values out of the box.
+To allow custom fields, you can use the `EntityCustomFieldsTrait`.
+This gives you some helper methods to easily work with custom field values out of the box.
 
 ```php
-<?php
+<?php declare(strict_types=1);
 
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait;
 
 #[EntityAttribute('example_entity')]
@@ -152,7 +229,16 @@ class ExampleEntity extends Entity
 Alternatively you can use the `CustomField` attribute directly, that way you have full control over the custom fields and can add your own helpers.
 
 ```php
-<?php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\CustomFields;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
 
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
@@ -172,13 +258,21 @@ class ExampleEntity extends Entity
 
 ## API encoding
 
-By default, each field of an entity is not exposed in the API. To expose a field in the API, you must set the `api` parameter of the `Field` attribute to `true` or specify one of the scopes you want to allow.
+By default, each field of an entity is not exposed in the API.
+To expose a field in the API, you must set the `api` parameter of the `Field` attribute to `true` or specify one of the scopes you want to allow.
 
 ```php
-<?php
+<?php declare(strict_types=1);
+
+namespace Examples;
 
 use Shopware\Core\Framework\Api\Context\AdminApiSource;
 use Shopware\Core\Framework\Api\Context\SalesChannelApiSource;
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
 
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
@@ -202,14 +296,26 @@ class ExampleEntity extends Entity
 
 ## Translated fields
 
-To support Shopware translations for your entity, set the `translated` property of the `Field` attribute to `true`. This will automatically create a `TranslatedField` for the field and
-register an `EntityTranslationDefinition` for you.
+To support Shopware translations for your entity, set the `translated` property of the `Field` attribute to `true`.
+This will automatically create a `TranslatedField` for the field and register an `EntityTranslationDefinition` for you.
 
-Additionally, you can define a `Translations` attribute on a property to enable loading of all translations of the entity. This field needs to be nullable, as by default it will not be loaded, but this allows you to add the `translations` association to the criteria to load all translations at once.
+Additionally, you can define a `Translations` attribute on a property to enable loading of all translations of the entity.
+This field needs to be nullable, as by default it will not be loaded, but this allows you to add the `translations` association to the criteria to load all translations at once.
 
 Notice: Properties with the `translated` flag must be nullable. 
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Translations;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
 {
@@ -230,10 +336,23 @@ class ExampleEntity extends Entity
 
 ## Required fields
 
-By default, any field that is not typehinted as `null` is required. However, you can explicitly mark a field as required by adding the `Required` attribute. This will automatically add a validation rule to the field.
+By default, any field that is not type-hinted as `null` is required.
+However, you can explicitly mark a field as required by adding the `Required` attribute.
+This will automatically add a validation rule to the field.
 This is necessary for fields marked as `translated`, as translated fields must be nullable.
 
 ```php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Required;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
 {
@@ -249,10 +368,26 @@ class ExampleEntity extends Entity
 
 ## Associations
 
-It is also possible to define associations between entities. You can use one of the following four association types: `OneToOne`, `OneToMany`, `ManyToOne` or `ManyToMany`.    
+It is also possible to define associations between entities.
+You can use one of the following four association types: `OneToOne`, `OneToMany`, `ManyToOne` or `ManyToMany`.    
 
 ```php
-<?php
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Examples\AttributeEntityAgg;
+use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\ForeignKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\ManyToMany;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\ManyToOne;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\OneToMany;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\OneToOne;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
+use Shopware\Core\System\Currency\CurrencyEntity;
 
 #[EntityAttribute('example_entity')]
 class ExampleEntity extends Entity
@@ -287,13 +422,16 @@ class ExampleEntity extends Entity
 }
 ```
 
-All the associations are defined as a nullable array property. The key of the array is the *ID* of the associated entity. The value is the associated entity by itself.
+All the associations are defined as a nullable array property.
+The key of the array is the *ID* of the associated entity.
+The value is the associated entity by itself.
 
 You can also typehint to many associations with the `EntityCollection` class.
 
 ## Getter & Setter, Translations and Collections
 
-With this new pattern, we removed the need for `getter` and `setter` methods. The properties are public and can be accessed directly.
+With this new pattern, we removed the need for `getter` and `setter` methods.
+The properties are public and can be accessed directly.
 Also, you don't have to define any `EntityTranslationDefinition` or `EntityCollection` anymore, which reduces the boilerplate code. 
 
 ## Full example
@@ -303,8 +441,9 @@ Also, you don't have to define any `EntityTranslationDefinition` or `EntityColle
 
 namespace Examples;
 
+use Shopware\Core\Checkout\Order\OrderEntity;
+use Shopware\Core\Checkout\Order\OrderStates;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\AutoIncrement;
-use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Entity as EntityAttribute;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Field;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\FieldType;
@@ -317,18 +456,22 @@ use Shopware\Core\Framework\DataAbstractionLayer\Attribute\OneToOne;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\PrimaryKey;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Required;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Serialized;
+use Shopware\Core\Framework\DataAbstractionLayer\Attribute\State;
 use Shopware\Core\Framework\DataAbstractionLayer\Attribute\Translations;
 use Shopware\Core\Framework\DataAbstractionLayer\Entity;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\PriceField;
 use Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\PriceFieldSerializer;
 use Shopware\Core\Framework\DataAbstractionLayer\FieldType\DateInterval;
 use Shopware\Core\Framework\DataAbstractionLayer\Pricing\PriceCollection;
 use Shopware\Core\Framework\Struct\ArrayEntity;
 use Shopware\Core\System\Currency\CurrencyEntity;
+use Shopware\Core\System\StateMachine\Aggregation\StateMachineState\StateMachineStateEntity;
 
 /**
  * @internal
  */
-#[EntityAttribute('example_entity', since: '6.6.3.0')]
+#[EntityAttribute('example_entity', since: '6.6.3.0', collectionClass: ExampleEntityCollection::class)]
 class ExampleEntity extends Entity
 {
     use EntityCustomFieldsTrait;
@@ -376,6 +519,9 @@ class ExampleEntity extends Entity
     #[Serialized(serializer: PriceFieldSerializer::class, api: true)]
     public ?PriceCollection $serialized = null;
 
+    #[Field(type: PriceField::class)]
+    public ?PriceCollection $price = null;
+
     #[Required]
     #[Field(type: FieldType::STRING, translated: true)]
     public string $transString;
@@ -410,9 +556,15 @@ class ExampleEntity extends Entity
     #[Field(type: FieldType::TIME_ZONE, translated: true)]
     public ?string $transTimeZone = null;
 
+    #[Field(type: FieldType::STRING, translated: true, column: 'another_column_name')]
+    public ?string $differentName = null;
+
     #[ForeignKey(entity: 'currency')]
     public ?string $currencyId = null;
 
+    #[State(machine: OrderStates::STATE_MACHINE)]
+    public ?string $stateId = null;
+
     #[ForeignKey(entity: 'currency')]
     public ?string $followId = null;
 
@@ -422,6 +574,9 @@ class ExampleEntity extends Entity
     #[OneToOne(entity: 'currency', onDelete: OnDelete::SET_NULL)]
     public ?CurrencyEntity $follow = null;
 
+    #[ManyToOne(entity: 'state_machine_state')]
+    public ?StateMachineStateEntity $state = null;
+
     /**
      * @var array<string, AttributeEntityAgg>|null
      */
@@ -434,6 +589,12 @@ class ExampleEntity extends Entity
     #[ManyToMany(entity: 'currency', onDelete: OnDelete::CASCADE)]
     public ?array $currencies = null;
 
+    /**
+     * @var array<string, OrderEntity>
+     */
+    #[ManyToMany(entity: 'order', onDelete: OnDelete::CASCADE)]
+    public ?array $orders = null;
+
     /**
      * @var array<string, ArrayEntity>|null
      */
@@ -441,4 +602,23 @@ class ExampleEntity extends Entity
     public ?array $translations = null;
 }
 
+
+<?php declare(strict_types=1);
+
+namespace Examples;
+
+use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection;
+
+/**
+ * @internal
+ *
+ * @extends EntityCollection<ExampleEntity>
+ */
+class ExampleEntityCollection extends EntityCollection
+{
+    protected function getExpectedClass(): string
+    {
+        return ExampleEntity::class;
+    }
+}
 ```