diff --git a/config/transduction-schemes.ttl b/config/transduction-schemes.ttl
index cd86ffa1b7cfaf44e89b1c76f28637b6fb0a8bd4..8e189bca203c3dc7bd8850a1ee57d3fa11f58bbe 100644
--- a/config/transduction-schemes.ttl
+++ b/config/transduction-schemes.ttl
@@ -397,27 +397,28 @@ WHERE {
    ?net1 a net:Instance.
    ?net1 net:type net:list.
    ?net1 net:listOf net:composite.
-   # -- old --- ?net1 net:entityClass ?entityClass.	
-   ?net1 net:has_parent ?parentObject. 
-   ?parentObject net:has_parent_class ?parentClass. # -- old --- ?entityClass
-   ?net1 net:has_item ?subEntityObject.	
-   ?subEntityObject net:has_concept ?subEntity.	
-   ?subEntityObject net:has_feature ?featureObject.	
+   # -- old --- ?net1 net:has_parent ?parentObject. 
+   # -- old --- ?parentObject net:has_parent_class ?parentClass. # -- old --- ?entityClass
+   ?net1 net:has_item ?itemObject.	
+   ?itemObject net:has_class_uri ?subEntityUri.	
+   # -- old --- ?itemObject net:has_concept ?subEntity.	
+   ?itemObject net:has_feature ?featureObject.	
    # object: feature
    ?featureObject a net:Object.
-   ?featureObject net:objectType sys:Feature.
-   ?featureObject net:has_node ?FeatureUW.
-   ?featureObject net:has_parent_class ?featureClass.
-   ?featureObject net:has_concept ?featureConcept.
-   # URI: entity class
-   sys:Structure sys:has_frame_uri ?frameURI.
+   ?featureObject net:has_class_uri ?featureUri.	
+   # -- old --- ?featureObject net:objectType sys:Feature.
+   # -- old --- ?featureObject net:has_node ?featureUW.
+   # -- old --- ?featureObject net:has_parent_class ?featureClass.
+   # -- old --- ?featureObject net:has_concept ?featureConcept.
+   # -- old --- # URI: entity class
+   # -- old --- sys:Structure sys:has_frame_uri ?frameURI.
    # -- old --- BIND (concat( ?frameURI, ?parentClass) AS ?c1).
-  BIND (concat(?frameURI, ?subEntity) AS ?c2). # -- old ---  BIND (concat(?c1, '#', ?subEntity) AS ?c2).
-   BIND (uri(?c2) AS ?subEntityUri).
-   # URI: feature class
+   # -- old --- BIND (concat(?frameURI, ?subEntity) AS ?c2). # -- old ---  BIND (concat(?c1, '#', ?subEntity) AS ?c2).
+   # -- old --- BIND (uri(?c2) AS ?subEntityUri).
+   # -- old ---  # URI: feature class
    # -- old ---  BIND (concat( ?frameURI, ?featureClass) AS ?f1).
-   BIND (concat(?frameURI, ?featureConcept) AS ?f2). # -- old ---  BIND (concat(?f1, '#', ?featureConcept) AS ?f2).
-   BIND (uri(?f2) AS ?featureUri).
+   # -- old ---  BIND (concat(?frameURI, ?featureConcept) AS ?f2).
+   # -- old ---  BIND (uri(?f2) AS ?featureUri).
 }""" ;
   sh:order 3.3 ;
 .
@@ -1213,23 +1214,26 @@ WHERE {
    ?net1 net:listOf net:composite.
    ?net1 net:has_structure ?req.
    ?net1 net:has_parent ?parentObject.
-   # -- old --- ?parentObject net:has_mother_class ?motherClass.
-   ?parentObject net:has_parent_class ?parentClass.
-   ?parentObject net:has_concept ?parentConcept.
+   ?parentObject net:has_class_uri ?parentUri.
    ?net1 net:has_item ?compositeObject.	
+   ?compositeObject net:has_class_uri ?newClassUri.		
+   ?compositeObject net:has_instance_uri ?instanceUri.	
    ?compositeObject net:has_concept ?compositeConcept.
-   ?compositeObject net:has_instance ?compositeInstance.	
+   # -- old --- ?parentObject net:has_mother_class ?motherClass.
+   # -- old --- ?parentObject net:has_parent_class ?parentClass.
+   # -- old --- ?parentObject net:has_concept ?parentConcept.
+   # -- old --- ?compositeObject net:has_instance ?compositeInstance.	
    # Filter -- old --- FILTER NOT EXISTS  { ?net2 net:has_subClass ?mainEntity}	
-   # URI (for classes)
-   sys:Structure sys:has_frame_uri ?frameURI.
-   BIND (concat( ?frameURI, ?parentConcept) AS ?s2). # -- old --- BIND (concat(?s1, '#', ?parentConcept) AS ?s2).
-   BIND (concat( ?frameURI, ?compositeConcept) AS ?s3). # -- old --- BIND (concat(?s1, '#', ?compositeConcept) AS ?s3).
-   BIND (uri(?s2) AS ?parentUri).
-   BIND (uri(?s3) AS ?newClassUri).
-   # URI (for instance)
-   BIND (concat( ?frameURI, ?parentClass) AS ?s1).
-   BIND (concat(?s1, '#', ?compositeInstance) AS ?s4).
-   BIND (uri(?s4) AS ?instanceUri).
+   # -- old --- # URI (for classes)
+   # -- old --- sys:Structure sys:has_frame_uri ?frameURI.
+   # -- old --- BIND (concat( ?frameURI, ?parentConcept) AS ?s2).
+   # -- old --- BIND (concat( ?frameURI, ?compositeConcept) AS ?s3).
+   # -- old --- BIND (uri(?s2) AS ?parentUri).
+   # -- old --- BIND (uri(?s3) AS ?newClassUri).
+   # -- old --- # URI (for instance)
+   # -- old --- BIND (concat( ?frameURI, ?parentClass) AS ?s1).
+   # -- old --- BIND (concat(?s1, '#', ?compositeInstance) AS ?s4).
+   # -- old --- BIND (uri(?s4) AS ?instanceUri).
 }""" ;
   sh:order 3.2 ;
 .
diff --git a/prepare_work_data.py b/prepare_work_data.py
index 50f145064e310e77059e17f6c76b501cb00c6a42..accfa610b9c6c55229f830946d340d9c645c4b84 100644
--- a/prepare_work_data.py
+++ b/prepare_work_data.py
@@ -207,7 +207,7 @@ if __name__ == '__main__':
     #run(req_100, 'R100b', target_ref) 
     #run(req_200, 'R200b', target_ref)
     run(req_300, 'R300b', target_ref) 
-    #run(corpus_40, 'Corpus-CCTP-40c', target_ref)
+    run(corpus_40, 'Corpus-CCTP-40a', target_ref)
     #run(corpus_ERTMS, 'Corpus-ERTMS', target_ref)
     #run(corpus_PEV, 'Corpus-PEV', target_ref)