diff --git a/src/Builder/MediaInfoContainerBuilder.php b/src/Builder/MediaInfoContainerBuilder.php
index 47b1991..d623142 100644
--- a/src/Builder/MediaInfoContainerBuilder.php
+++ b/src/Builder/MediaInfoContainerBuilder.php
@@ -2,9 +2,10 @@
 
 namespace Mhor\MediaInfo\Builder;
 
+use Mhor\MediaInfo\Factory\AttributeFactory;
+use Mhor\MediaInfo\Factory\TypeFactory;
 use Mhor\MediaInfo\Type\AbstractType;
 use Mhor\MediaInfo\Type\MediaInfoContainer;
-use Mhor\MediaInfo\Type\TypeFactory;
 
 class MediaInfoContainerBuilder
 {
@@ -55,7 +56,16 @@ public function addAttributes(AbstractType $trackType, $attributes)
     {
         $this->mediaInfoContainer;
         foreach ($attributes as $attribute => $value) {
-            $trackType->set($attribute, $value);
+            $attribute = $this->formatAttribute($attribute);
+            $trackType->set(
+                $attribute,
+                AttributeFactory::create(get_class($trackType), $attribute, $value)
+            );
         }
     }
+
+    private function formatAttribute($attribute)
+    {
+        return str_replace(' ', '_', strtolower($attribute));
+    }
 } 
\ No newline at end of file
diff --git a/src/Factory/AttributeFactory.php b/src/Factory/AttributeFactory.php
new file mode 100644
index 0000000..e4fd290
--- /dev/null
+++ b/src/Factory/AttributeFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Mhor\MediaInfo\Factory;
+
+use Mhor\MediaInfo\Type\MediaInfoContainer;
+
+class AttributeFactory
+{
+    public static function create($attributeTypeClass, $attribute, $value)
+    {
+        switch ($attributeTypeClass) {
+            case MediaInfoContainer::VIDEO_CLASS:
+                return VideoAttributeFactory::create($attribute, $value);
+                break;
+            case MediaInfoContainer::AUDIO_CLASS:
+                return AudioAttributeFactory::create($attribute, $value);
+                break;
+            case MediaInfoContainer::IMAGE_CLASS:
+                return ImageAttributeFactory::create($attribute, $value);
+                break;
+            case MediaInfoContainer::GENERAL_CLASS:
+                return GeneralAttributeFactory::create($attribute, $value);
+                break;
+            default:
+                throw new \Exception('Type doesn\'t exist');
+                break;
+        }
+    }
+} 
\ No newline at end of file
diff --git a/src/Factory/AudioAttributeFactory.php b/src/Factory/AudioAttributeFactory.php
new file mode 100644
index 0000000..3eb1b70
--- /dev/null
+++ b/src/Factory/AudioAttributeFactory.php
@@ -0,0 +1,14 @@
+<?php
+
+
+namespace Mhor\MediaInfo\Factory;
+
+
+class AudioAttributeFactory
+{
+    public static function create($attribute, $value)
+    {
+        return GenericAttributeFactory::create($attribute, $value);
+
+    }
+} 
\ No newline at end of file
diff --git a/src/Factory/GeneralAttributeFactory.php b/src/Factory/GeneralAttributeFactory.php
new file mode 100644
index 0000000..8495d97
--- /dev/null
+++ b/src/Factory/GeneralAttributeFactory.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Mhor\MediaInfo\Factory;
+
+class GeneralAttributeFactory
+{
+    public static function create($attribute, $value)
+    {
+        return GenericAttributeFactory::create($attribute, $value);
+    }
+} 
\ No newline at end of file
diff --git a/src/Factory/GenericAttributeFactory.php b/src/Factory/GenericAttributeFactory.php
new file mode 100644
index 0000000..23c2d87
--- /dev/null
+++ b/src/Factory/GenericAttributeFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+
+namespace Mhor\MediaInfo\Factory;
+
+class GenericAttributeFactory
+{
+    public static function create($attribute, $value)
+    {
+        switch ($attribute) {
+            default:
+                return $value;
+                break;
+        }
+    }
+} 
\ No newline at end of file
diff --git a/src/Factory/ImageAttributeFactory.php b/src/Factory/ImageAttributeFactory.php
new file mode 100644
index 0000000..a3dbd74
--- /dev/null
+++ b/src/Factory/ImageAttributeFactory.php
@@ -0,0 +1,15 @@
+<?php
+
+
+namespace Mhor\MediaInfo\Factory;
+
+
+class ImageAttributeFactory
+{
+    public static function create($attribute, $value)
+    {
+        return GenericAttributeFactory::create($attribute, $value);
+
+
+    }
+} 
\ No newline at end of file
diff --git a/src/Type/TypeFactory.php b/src/Factory/TypeFactory.php
similarity index 84%
rename from src/Type/TypeFactory.php
rename to src/Factory/TypeFactory.php
index 252d0f6..c437012 100644
--- a/src/Type/TypeFactory.php
+++ b/src/Factory/TypeFactory.php
@@ -1,6 +1,10 @@
 <?php
 
-namespace Mhor\MediaInfo\Type;
+namespace Mhor\MediaInfo\Factory;
+
+use Mhor\MediaInfo\Type\Audio;
+use Mhor\MediaInfo\Type\General;
+use Mhor\MediaInfo\Type\Image;
 
 class TypeFactory
 {
diff --git a/src/Factory/VideoAttributeFactory.php b/src/Factory/VideoAttributeFactory.php
new file mode 100644
index 0000000..3625ce4
--- /dev/null
+++ b/src/Factory/VideoAttributeFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+
+namespace Mhor\MediaInfo\Factory;
+
+
+class VideoAttributeFactory
+{
+    public static function create($attribute, $value)
+    {
+        return GenericAttributeFactory::create($attribute, $value);
+    }
+} 
\ No newline at end of file