diff --git a/src/Attribute/EntityWithoutEmpty.php b/src/Attribute/EntityWithoutEmpty.php
new file mode 100644
index 0000000..415fe4b
--- /dev/null
+++ b/src/Attribute/EntityWithoutEmpty.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rmphp\Storage\Attribute;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class EntityWithoutEmpty {}
diff --git a/src/Attribute/GetPropertyEmptyIfNull.php b/src/Attribute/GetPropertyEmptyIfNull.php
index 1648d0e..0d17b2f 100644
--- a/src/Attribute/GetPropertyEmptyIfNull.php
+++ b/src/Attribute/GetPropertyEmptyIfNull.php
@@ -4,5 +4,5 @@ namespace Rmphp\Storage\Attribute;
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY|Attribute::TARGET_CLASS)]
 class GetPropertyEmptyIfNull {}
diff --git a/src/Attribute/ValueObject.php b/src/Attribute/ValueObject.php
index 86ea8f6..1792ce0 100644
--- a/src/Attribute/ValueObject.php
+++ b/src/Attribute/ValueObject.php
@@ -8,6 +8,7 @@ use Attribute;
 class ValueObject {
 
 	public function __construct(
+		public bool $autoPropertyName = true,
 		public ?string $propertyName = null,
 	) {}
 
diff --git a/src/Component/AbstractDataObject.php b/src/Component/AbstractDataObject.php
index 5a7390b..13a353e 100644
--- a/src/Component/AbstractDataObject.php
+++ b/src/Component/AbstractDataObject.php
@@ -6,6 +6,7 @@ use Exception;
 use ReflectionClass;
 use ReflectionException;
 use Rmphp\Storage\Attribute\Entity;
+use Rmphp\Storage\Attribute\EntityWithoutEmpty;
 
 abstract class AbstractDataObject {
 
@@ -32,6 +33,7 @@ abstract class AbstractDataObject {
 			}
 			/** @var Entity $entityAttributes */
 			$entityAttributes = self::$attributeObjects[$class->getName()][0];
+			if(!empty($class->getAttributes(EntityWithoutEmpty::class))) $entityAttributes->withoutEmpty = true;
 
 			$value = [];
 			foreach($class->getProperties() as $property){
diff --git a/src/Repository/AbstractRepository.php b/src/Repository/AbstractRepository.php
index 685de2f..8ea23d4 100644
--- a/src/Repository/AbstractRepository.php
+++ b/src/Repository/AbstractRepository.php
@@ -2,9 +2,11 @@
 
 namespace Rmphp\Storage\Repository;
 
+use App\Domain\ValueObject\Price;
 use Exception;
 use ReflectionClass;
 use Rmphp\Storage\Attribute\Entity;
+use Rmphp\Storage\Attribute\EntityWithoutEmpty;
 use Rmphp\Storage\Attribute\GetProperty;
 use Rmphp\Storage\Attribute\GetPropertyEmpty;
 use Rmphp\Storage\Attribute\GetPropertyEmptyIfNull;
@@ -29,6 +31,8 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 			}
 			/** @var Entity $entityAttributes */
 			$entityAttributes = self::$attributeObjects[$class][0];
+			if(!empty(self::$classes[$class]->getAttributes(EntityWithoutEmpty::class))) $entityAttributes->withoutEmpty = true;
+			if(!empty(self::$classes[$class]->getAttributes(GetPropertyEmptyIfNull::class))) $entityAttributes->withoutEmpty = true;
 
 			$fieldValue = [];
 			foreach(self::$classes[$class]->getProperties() as $property){
@@ -40,6 +44,7 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 				}
 				/** @var GetProperty $getPropertyAttributes */
 				$getPropertyAttributes = self::$attributeObjects[$class][$property->getName()];
+				if(!empty($property->getAttributes(GetPropertyEmptyIfNull::class))) $getPropertyAttributes->emptyIfNull = true;
 
 				if(!empty($property->getAttributes(GetPropertyEmpty::class)) || !empty($getPropertyAttributes->empty)) continue;
 
@@ -63,8 +68,13 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 						$valueObjectAttributes = self::$attributeObjects[$valueObjectClass];
 
 						if(!empty($valueObjectAttributes->propertyName) && self::$classes[$valueObjectClass]->hasProperty($valueObjectAttributes->propertyName)){
-							if(self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->isInitialized($property->getValue($object)))
+							if(self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->isInitialized($property->getValue($object))){
 								$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->getValue($property->getValue($object));
+							}
+						} elseif(!empty($valueObjectAttributes->autoPropertyName) && count(self::$classes[$valueObjectClass]->getProperties()) === 1){
+							if(self::$classes[$valueObjectClass]->getProperties()[0]->isInitialized($property->getValue($object))){
+								$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperties()[0]->getValue($property->getValue($object));
+							}
 						} else{
 							$fieldValue[$property->getName()] = $property->getValue($object)->getValue();
 						}
@@ -76,10 +86,7 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 						$fieldValue[$property->getName()] = $property->getValue($object);
 					}
 
-					if(
-						!isset($fieldValue[$property->getName()])
-						&& (!empty($property->getAttributes(GetPropertyEmptyIfNull::class)) || !empty($getPropertyAttributes->emptyIfNull) || !empty($entityAttributes->withoutNull))
-					) continue;
+					if(!isset($fieldValue[$property->getName()]) && (!empty($getPropertyAttributes->emptyIfNull) || !empty($entityAttributes->withoutEmpty))) continue;
 
 					if(array_key_exists($property->getName(), $fieldValue) && false !== $fieldValue[$property->getName()]) {
 						$columnName = !empty($getPropertyAttributes->keyName) ? $getPropertyAttributes->keyName : strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));