diff --git a/composer.json b/composer.json
index b40a0438..3707ea55 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "cycle/orm": "^2.9.1",
+        "cycle/orm": "^2.9.2",
         "cycle/schema-builder": "^2.11.1",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/tokenizer": "^2.8|^3.0",
diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml
index 69716b53..5e1dfbc6 100644
--- a/resources/annotated.meta-storm.xml
+++ b/resources/annotated.meta-storm.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <meta-storm xmlns="meta-storm">
     <definitions>
-        <collection
-            className="\Cycle\Annotated\Annotation\Embeddable"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Embeddable"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
+        <classConstructor class="\Cycle\Annotated\Annotation\Embeddable" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
 
-        <collection
-            className="\Cycle\Annotated\Annotation\ForeignKey"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\ForeignKey"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
     </definitions>
 </meta-storm>
diff --git a/resources/collections.meta-storm.xml b/resources/collections.meta-storm.xml
index d3a629cd..1d83bd1d 100644
--- a/resources/collections.meta-storm.xml
+++ b/resources/collections.meta-storm.xml
@@ -2,21 +2,17 @@
 <meta-storm xmlns="meta-storm">
     <collections>
         <attributeArgument
-            name="entity-role"
-            className="\Cycle\Annotated\Annotation\Entity"
-            argumentIndex="0"
+            name="cycle/orm:entity-role"
+            class="\Cycle\Annotated\Annotation\Entity"
+            argument="0"
         />
         <attributeClass
-            name="entity-class"
-            className="\Cycle\Annotated\Annotation\Entity"
+            name="cycle/orm:entity-class"
+            class="\Cycle\Annotated\Annotation\Entity"
         />
         <attributeClass
-            name="entity-embeddable-class"
-            className="\Cycle\Annotated\Annotation\Embeddable"
-        />
-        <attributeClass
-            name="cycle-mapper"
-            className="\Cycle\Annotated\Annotation\Embeddable"
+            name="cycle/orm:entity-embeddable-class"
+            class="\Cycle\Annotated\Annotation\Embeddable"
         />
     </collections>
 </meta-storm>
diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml
deleted file mode 100644
index 50f2685b..00000000
--- a/resources/orm-factory.meta-storm.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta-storm xmlns="meta-storm">
-    <definitions>
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="mapper"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="mapper"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="loader"
-            argumentIndex="2"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="loader"
-            argumentIndex="2"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="repository"
-            argumentIndex="2"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="repository"
-            argumentIndex="2"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="typecast"
-            argumentIndex="2"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="typecast"
-            argumentIndex="2"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="source"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="source"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="relation"
-            argumentIndex="2"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\FactoryInterface"
-            methodName="relation"
-            argumentIndex="2"
-            collectionName="entity-role"
-        />
-    </definitions>
-</meta-storm>
diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml
deleted file mode 100644
index 865903a5..00000000
--- a/resources/orm-iterator.meta-storm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta-storm xmlns="meta-storm">
-    <definitions>
-        <collection
-            className="\Cycle\ORM\Iterator"
-            methodName="createWithOrm"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Iterator"
-            methodName="createWithOrm"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Iterator"
-            methodName="createWithServices"
-            argumentIndex="3"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Iterator"
-            methodName="createWithServices"
-            argumentIndex="3"
-            collectionName="entity-role"
-        />
-    </definitions>
-</meta-storm>
diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml
deleted file mode 100644
index 918a88ee..00000000
--- a/resources/orm-schema.meta-storm.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta-storm xmlns="meta-storm">
-    <definitions>
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="getRelations"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="getRelations"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="defines"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="defines"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="define"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="define"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="defineRelation"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="defineRelation"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="resolveAlias"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="resolveAlias"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="getInheritedRoles"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\SchemaInterface"
-            methodName="getInheritedRoles"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-    </definitions>
-</meta-storm>
diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml
deleted file mode 100644
index 263a1031..00000000
--- a/resources/orm-services.meta-storm.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta-storm xmlns="meta-storm">
-    <definitions>
-        <collection
-            className="\Cycle\ORM\Service\SourceProviderInterface"
-            methodName="getSource"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\SourceProviderInterface"
-            methodName="getSource"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\EntityProviderInterface"
-            methodName="get"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\EntityProviderInterface"
-            methodName="get"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\EntityFactoryInterface"
-            methodName="make"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\EntityFactoryInterface"
-            methodName="make"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\IndexProviderInterface"
-            methodName="getIndexes"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\IndexProviderInterface"
-            methodName="getIndexes"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\ORMInterface"
-            methodName="resolveRole"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\ORMInterface"
-            methodName="resolveRole"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\RelationProviderInterface"
-            methodName="getRelationMap"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\RelationProviderInterface"
-            methodName="getRelationMap"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\MapperProviderInterface"
-            methodName="getMapper"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\MapperProviderInterface"
-            methodName="getMapper"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\RepositoryProviderInterface"
-            methodName="getRepository"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\RepositoryProviderInterface"
-            methodName="getRepository"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Service\TypecastProviderInterface"
-            methodName="getTypecast"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Service\TypecastProviderInterface"
-            methodName="getTypecast"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-    </definitions>
-</meta-storm>
diff --git a/resources/orm.meta-storm.xml b/resources/orm.meta-storm.xml
deleted file mode 100644
index 9bb7ad52..00000000
--- a/resources/orm.meta-storm.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta-storm xmlns="meta-storm">
-    <definitions>
-        <collection
-            className="\Cycle\ORM\MapperInterface"
-            methodName="init"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\MapperInterface"
-            methodName="init"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Select"
-            methodName="__construct"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Select"
-            methodName="__construct"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\ORM\Heap\HeapInterface"
-            methodName="find"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\ORM\Heap\HeapInterface"
-            methodName="find"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-    </definitions>
-</meta-storm>
diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index 614255c4..7fd218fb 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -1,127 +1,52 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <meta-storm xmlns="meta-storm">
     <definitions>
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\BelongsTo"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\BelongsTo"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\HasMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\HasMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\HasOne"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\HasOne"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\RefersTo"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\RefersTo"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\ManyToMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\ManyToMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\ManyToMany"
-            methodName="__construct"
-            argumentIndex="1"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\ManyToMany"
-            methodName="__construct"
-            argumentIndex="1"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
-
-        <collection
-            className="\Cycle\Annotated\Annotation\Relation\Embedded"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-embeddable-class"
-        />
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="1">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsToMorphed" argument="1">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\MorphedHasMany" argument="1">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\MorphedHasOne" argument="1">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Embedded" argument="0">
+            <collection name="cycle/orm:entity-embeddable-class" argument="0" />
+        </classConstructor>
     </definitions>
 </meta-storm>