diff --git a/.gitignore b/.gitignore
index f72680670..cdf890807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ local/config/config_db.php
 local/config/build
 core/vendor
 local/config/runtime-conf.xml
+propel-gen
diff --git a/core/autoload.php b/core/autoload.php
index cbc8ad5ca..0ca1f5399 100644
--- a/core/autoload.php
+++ b/core/autoload.php
@@ -27,21 +27,21 @@ if(file_exists(__DIR__ . '/vendor/composer/autoload_classmap.php'))
         
     $loader->addClassMap($classMap);
 }
-
-$loader->addClassMap(array(
-    'NotORM' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM.php',
-    'NotORM_Cache_Session' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Cache_File' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Cache_Include' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Cache_Database' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Cache_Memcache' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Cache_APC' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
-    'NotORM_Literal' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Literal.php',
-    'NotORM_MultiResult' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/MultiResult.php',
-    'NotORM_Result' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Result.php',
-    'NotORM_Row' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Row.php',
-    'NotORM_Structure_Convention' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Structure.php',
-    'NotORM_Structure_Discovery' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Structure.php',
-));
+//
+//$loader->addClassMap(array(
+//    'NotORM' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM.php',
+//    'NotORM_Cache_Session' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Cache_File' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Cache_Include' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Cache_Database' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Cache_Memcache' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Cache_APC' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Cache.php',
+//    'NotORM_Literal' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Literal.php',
+//    'NotORM_MultiResult' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/MultiResult.php',
+//    'NotORM_Result' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Result.php',
+//    'NotORM_Row' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Row.php',
+//    'NotORM_Structure_Convention' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Structure.php',
+//    'NotORM_Structure_Discovery' => THELIA_ROOT . '/core/vendor/vrana/notorm/NotORM/Structure.php',
+//));
 
 $loader->register();
diff --git a/core/composer.json b/core/composer.json
index 3baea9b25..586d607a1 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -10,5 +10,8 @@
         "symfony-cmf/routing" : "1.0.*@dev",
         "vrana/notorm": "dev-master"
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "stable",
+    "autoload" : {
+        "classmap" : ["vendor/vrana/notorm/NotORM.php","vendor/vrana/notorm/NotORM"]
+    }
 }
diff --git a/core/composer.lock b/core/composer.lock
index dca95df05..078ede977 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -1,5 +1,5 @@
 {
-    "hash": "0f4d3d738985b803a4bf307ef2d7e85c",
+    "hash": "4dac998c040ba1f3fcdd8ddd3e49262c",
     "packages": [
         {
             "name": "symfony-cmf/routing",