Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/citation_pmc.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/citation_pmc.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/citation_pmc.json	(nonexistent)
@@ -1,8 +0,0 @@
-{
-  "sourceDocumentId": "id-3",
-  "rawText": "Kovach, M.E., Elzer, P.H., Hill, D.S., Robertson, G.T., Farris, M.A., Roop, R.M., Peterson, K.M.. Four new derivatives of the broad-host range cloning vector pBBR1MCS, carrying different antibiotic resistance cassettes. Gene. 1995; 166: 175-176",
-  "destinationDocumentId": "pmc-id",
-  "externalDestinationDocumentIds": {
-    "pmid": "1234567"
-  }
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person:body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person:body	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person:body	(nonexistent)
@@ -1,29 +0,0 @@
-{
-	kind: entity
-  	entity: {
-    type: person
-    id: "30|0314fe20-be3c-4bc3-adee-6bbc2cde3cb7_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=::oai:DiVA.org:uu-127423_Oliveira__Paulo_UNKNOWN"
-    person: {
-      metadata: {
-        firstname: {
-        	value: "Oliveira, Paulo"
-        }
-        fullname: {
-        	value: "Oliveira, Paulo"
-        }
-      }
-    }
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "0.9"
-    provenanceaction: {
-      classid: "UNKNOWN"
-      classname: "UNKNOWN"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1360248058786
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project:body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project:body	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project:body	(nonexistent)
@@ -1,58 +0,0 @@
-{
-  kind: entity
-  entity: {
-    type: project
-    id: "40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43"
-    project: {
-      metadata: {
-        code: {
-        	value: "241544"
-        }
-        acronym: {
-        	value: "SYSKID"
-        }
-        title: {
-        	value: "Systems biology towards novel chronic kidney disease diagnosis and treatment"
-        }
-        startdate: {
-        	value: "2010-01-01"
-        }
-        enddate: {
-        	value: "2014-12-31"
-        }
-        callidentifier: {
-        	value: "FP7-HEALTH-2009-single-stage"
-        }
-        ecsc39: {
-        	value: "true"
-        }
-        contracttype: {
-          classid: "CP"
-          classname: "Collaborative project"
-          schemeid: "ec:FP7contractTypes"
-          schemename: "ec:FP7contractTypes"
-        }
-        fundingtree: {
-        	value: "{\"funding_level_2\":{\"class\":\"ec:program\", \"id\":\"corda_______::FP7::SP1::HEALTH\", \"description\":\"Health\", \"name\":\"HEALTH\", \"parent\":{\"funding_level_1\":{\"class\":\"ec:specificprogram\", \"id\":\"corda_______::FP7::SP1\", \"description\":\"SP1-Cooperation\", \"name\":\"SP1\", \"parent\":{\"funding_level_0\":{\"class\":\"ec:frameworkprogram\", \"id\":\"corda_______::FP7\", \"description\":\"SEVENTH FRAMEWORK PROGRAMME\", \"name\":\"FP7\", \"parent\":{}}}}}}}"
-        }
-      }
-    }
-    originalId: "corda_______::241544"
-    collectedfrom: {
-      key: "10|openaire____::b30dac7baac631f3da7c2bb18dd9891f"
-      value: "CORDA - COmmon Research DAta Warehouse"
-    }
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "0.9"
-    provenanceaction: {
-      classid: "sysimport:crosswalk:entityregistry"
-      classname: "sysimport:crosswalk:entityregistry"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372675091270
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result:body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result:body	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result:body	(nonexistent)
@@ -1,85 +0,0 @@
-{
-  kind: entity
-  entity: {
-    type: result
-    id: "50|dedup_wf_001::0154f41ff22d1ac2ef656d2931ac828c"
-    result: {
-      metadata: {
-        title: {
-          value: "Soldadura entre gr\\303\\241nulos"
-          qualifier: {
-            classid: "main title"
-            classname: "main title"
-            schemeid: "dnet:dataCite_title"
-            schemename: "dnet:dataCite_title"
-          }
-        }
-        dateofacceptance: {
-          value: "2011-01-01"
-        }
-        resulttype: {
-          classid: "publication"
-          classname: "publication"
-          schemeid: "dnet:result_typologies"
-          schemename: "dnet:result_typologies"
-        }
-        storagedate: { 
-        	value: "2012-10-18"
-        }
-        language: {
-          classid: "und"
-          classname: "Undetermined"
-          schemeid: "dnet:languages"
-          schemename: "dnet:languages"
-        }
-      }
-      
-      instance: {
-	    licence: {
-	      classid: "OPEN"
-	      classname: "Open Access"
-	      schemeid: "dnet:access_modes"
-	      schemename: "dnet:access_modes"
-	    }
-	    instancetype: {
-	      classid: "0001"
-	      classname: "Article"
-	      schemeid: "dnet:publication_resource"
-	      schemename: "dnet:publication_resource"
-	    }
-	    hostedby: {
-	      key: "10|opendoar____::9766527f2b5d3e95d4a733fcfb77bd7e"
-	      value: "INRIA a CCSD electronic archive server"
-	    }
-	    url: "http://hal.archives-ouvertes.fr/hal-00613125"
-	  }
-
-    }
-    originalId: "crossref____::003b0746ef72ff253ef1e465c758c961"
-    collectedfrom: {
-      key: "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2"
-      value: "Crossref"
-    }
-    pid: {
-      value: "doi:10.1002/prca.201000155"
-      qualifier: {
-        classid: "doi"
-        classname: "doi"
-        schemeid: "dnet:pid_types"
-        schemename: "dnet:pid_types"
-      }
-    }
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "NEUTRAL"
-    provenanceaction: {
-      classid: "user:claim:doi"
-      classname: "user:claim:doi"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372359095914
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges:50|od______1106::8477827a014277dfebb0d5882496a797
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges:50|od______1106::8477827a014277dfebb0d5882496a797	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges:50|od______1106::8477827a014277dfebb0d5882496a797	(nonexistent)
@@ -1,35 +0,0 @@
-{
-  kind: relation
-  rel: {
-    relType: resultResult
-    source: "50|dedup_wf_001::0154f41ff22d1ac2ef656d2931ac828c"
-    target: "50|od______1106::8477827a014277dfebb0d5882496a797"
-    child: false
-    resultResult: {
-      dedup: {
-	      relMetadata: {
-	        semantics: {
-	          classid: "merges"
-	          classname: "merges"
-	          schemeid: "dnet:result_result_relations"
-	          schemename: "dnet:result_result_relations"
-	        }
-	      }
-	   }
-    }
-    subRelType: dedup
-    relClass: "merges"
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "0.8"
-    provenanceaction: {
-      classid: ""
-      classname: ""
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1423870324129
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result:body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result:body	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result:body	(nonexistent)
@@ -1,85 +0,0 @@
-{
-  kind: entity
-  entity: {
-    type: result
-    id: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
-    result: {
-      metadata: {
-        title: {
-          value: "Human urinary peptide database for multiple disease biomarker discovery"
-          qualifier: {
-            classid: "main title"
-            classname: "main title"
-            schemeid: "dnet:dataCite_title"
-            schemename: "dnet:dataCite_title"
-          }
-        }
-        dateofacceptance: {
-          value: "2011-01-01"
-        }
-        resulttype: {
-          classid: "publication"
-          classname: "publication"
-          schemeid: "dnet:result_typologies"
-          schemename: "dnet:result_typologies"
-        }
-        storagedate: { 
-        	value: "2012-10-18"
-        }
-        language: {
-          classid: "und"
-          classname: "Undetermined"
-          schemeid: "dnet:languages"
-          schemename: "dnet:languages"
-        }
-      }
-      
-      instance: {
-	    licence: {
-	      classid: "OPEN"
-	      classname: "Open Access"
-	      schemeid: "dnet:access_modes"
-	      schemename: "dnet:access_modes"
-	    }
-	    instancetype: {
-	      classid: "0001"
-	      classname: "Article"
-	      schemeid: "dnet:publication_resource"
-	      schemename: "dnet:publication_resource"
-	    }
-	    hostedby: {
-	      key: "10|opendoar____::9766527f2b5d3e95d4a733fcfb77bd7e"
-	      value: "INRIA a CCSD electronic archive server"
-	    }
-	    url: "http://hal.archives-ouvertes.fr/hal-00613125"
-	  }
-
-    }
-    originalId: "crossref____::003b0746ef72ff253ef1e465c758c961"
-    collectedfrom: {
-      key: "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2"
-      value: "Crossref"
-    }
-    pid: {
-      value: "doi:10.1002/prca.201000155"
-      qualifier: {
-        classid: "doi"
-        classname: "doi"
-        schemeid: "dnet:pid_types"
-        schemename: "dnet:pid_types"
-      }
-    }
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "NEUTRAL"
-    provenanceaction: {
-      classid: "user:claim:doi"
-      classname: "user:claim:doi"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372359095914
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::7c844171342140b6133fb0536dba9843
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::7c844171342140b6133fb0536dba9843	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::7c844171342140b6133fb0536dba9843	(nonexistent)
@@ -1,36 +0,0 @@
-{
-  kind: relation
-  rel: {
-    relType: personResult
-    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
-    target: "30|crossref____::7c844171342140b6133fb0536dba9843"
-    child: false
-    personResult: {
-      authorship: {
-      		relMetadata: {
-        		semantics: {
-          			classid: "hasAuthor"
-          			classname: "hasAuthor"
-          			schemeid: "dnet:personroles"
-          			schemename: "dnet:personroles"
-        		}
-      		}
-      		ranking: "4"
-    	}
-  	}
-  	subRelType: authorship
-  	relClass: "hasAuthor"
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "NEUTRAL"
-    provenanceaction: {
-      classid: "user:claim:doi"
-      classname: "user:claim:doi"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372359095915
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy:40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy:40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy:40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43	(nonexistent)
@@ -1,35 +0,0 @@
-{
-  kind: relation
-  rel: {
-    relType: resultProject
-    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
-    target: "40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43"
-    child: false
-    resultProject: {
-      outcome: {
-	      relMetadata: {
-	        semantics: {
-	          classid: "isProducedBy"
-	          classname: "isProducedBy"
-	          schemeid: "dnet:result_project_relations"
-	          schemename: "dnet:result_project_relations"
-	        }
-	      }
-	   }
-    }
-    subRelType: outcome
-    relClass: "isProducedBy"
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "0.8"
-    provenanceaction: {
-      classid: ""
-      classname: ""
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372359095915
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::f6813047fd08021c87acdee2061c20f4
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::f6813047fd08021c87acdee2061c20f4	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor:30|crossref____::f6813047fd08021c87acdee2061c20f4	(nonexistent)
@@ -1,36 +0,0 @@
-{
-  kind: relation
-  rel: {
-    relType: personResult
-    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
-    target: "30|crossref____::f6813047fd08021c87acdee2061c20f4"
-    child: false
-    personResult: {
-      authorship: {
-      		relMetadata: {
-        		semantics: {
-          			classid: "hasAuthor"
-          			classname: "hasAuthor"
-          			schemeid: "dnet:personroles"
-          			schemename: "dnet:personroles"
-        		}
-      		}
-      		ranking: "5"
-    	}
-    }
-    subRelType: authorship
-  	relClass: "hasAuthor"
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "NEUTRAL"
-    provenanceaction: {
-      classid: "user:claim:doi"
-      classname: "user:claim:doi"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1372359095915
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result:body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result:body	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result:body	(nonexistent)
@@ -1,85 +0,0 @@
-{
-  kind: entity
-  entity: {
-    type: result
-    id: "50|od______1106::138537e0568c27c402756042b15e7858"
-    result: {
-      metadata: {
-        title: {
-          value: "Santa Rosa [ciruelo]"
-          qualifier: {
-            classid: "main title"
-            classname: "main title"
-            schemeid: "dnet:dataCite_title"
-            schemename: "dnet:dataCite_title"
-          }
-        }
-        dateofacceptance: {
-          value: "1964-12-01"
-        }
-        resulttype: {
-          classid: "publication"
-          classname: "publication"
-          schemeid: "dnet:result_typologies"
-          schemename: "dnet:result_typologies"
-        }
-        storagedate: { 
-        	value: "2012-10-18"
-        }
-        language: {
-          classid: "und"
-          classname: "Undetermined"
-          schemeid: "dnet:languages"
-          schemename: "dnet:languages"
-        }
-      }
-      
-      instance: {
-	    licence: {
-	      classid: "OPEN"
-	      classname: "Open Access"
-	      schemeid: "dnet:access_modes"
-	      schemename: "dnet:access_modes"
-	    }
-	    instancetype: {
-	      classid: "0021"
-	      classname: "Dataset"
-	      schemeid: "dnet:publication_resource"
-	      schemename: "dnet:publication_resource"
-	    }
-	    hostedby: {
-	      key: "10|opendoar____::c9f95a0a5af052bffce5c89917335f67"
-	      value: "Digital.CSIC"
-	    }
-	    url: "http://hdl.handle.net/10261/86687"
-	  }
-
-    }
-    originalId: "oai:digital.csic.es:10261/86687"
-    collectedfrom: {
-      key: "10|opendoar____::c9f95a0a5af052bffce5c89917335f67"
-      value: "Digital.CSIC"
-    }
-    pid: {
-      value: "oai:digital.csic.es:10261/86687"
-      qualifier: {
-        classid: "oai"
-        classname: "Open Archives Initiative"
-        schemeid: "dnet:pid_types"
-        schemename: "dnet:pid_types"
-      }
-    }
-  }
-  dataInfo: {
-    inferred: false
-    deletedbyinference: false
-    trust: "0.9"
-    provenanceaction: {
-      classid: "sysimport:crosswalk:repository"
-      classname: "sysimport:crosswalk:repository"
-      schemeid: "dnet:provenanceActions"
-      schemename: "dnet:provenanceActions"
-    }
-  }
-  timestamp: 1423856239322
-}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/oozie_app/workflow.xml	(revision 39164)
@@ -288,7 +288,34 @@
 			<value>$UNDEFINED$</value>
 			<description>external hbase zookeeper client port, required only whe zookeeper quorum property is set</description>
 		</property>
+		<!-- trust level threshold section -->
 		<property>
+			<name>export_trust_level_threshold</name>
+			<value>$UNDEFINED$</value>
+			<description>default trust level threshold of exported data</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_classes</name>
+			<value>$UNDEFINED$</value>
+			<description>document_classes trust level threshold</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_referencedProjects</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedProjects trust level threshold</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_referencedDatasets</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedDatasets trust level threshold</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_pdb</name>
+			<value>$UNDEFINED$</value>
+			<description>document to protein databank trust level threshold</description>
+		</property>
+		<!--  -->
+		<property>
 			<name>export_documentssimilarity_threshold</name>
 			<value>$UNDEFINED$</value>
 			<description>documents similarity threshold value below which similarity export is omitted</description>
@@ -444,19 +471,7 @@
 					<name>content_read_timeout</name>
 					<value>${import_content_read_timeout}</value>
 				</property>
-				<!-- metadata extraction related -->
-				<property>
-					<name>metadataextraction_excluded_checksums</name>
-					<value>${metadataextraction_excluded_checksums}</value>
-				</property>
-				<property>
-					<name>metadataextraction_max_file_size_mb</name>
-					<value>${metadataextraction_max_file_size_mb}</value>
-				</property>
-				<property>
-					<name>metadataextraction_default_cache_location</name>
-					<value>${metadataextraction_default_cache_location}</value>
-				</property>
+				<!-- metadata extraction related are autmatically propagated-->
 				<!-- metadatainput and metadataextraction output subdirectory names -->
 				<property>
 					<name>metadataimport_output_name_document_meta</name>
@@ -496,10 +511,6 @@
 					<value>${workingDir}/mainworkflows_common_import/dataset_to_mdstore</value>
 				</property>
 				<property>
-					<name>output_citation_pmc</name>
-					<value>${workingDir}/mainworkflows_common_import/citation_pmc</value>
-				</property>
-				<property>
 					<name>output_document_text</name>
 					<value>${workingDir}/mainworkflows_common_import/document-text</value>
 				</property>
@@ -589,10 +600,6 @@
 					<value>${workingDir}/mainworkflows_common_import/extracted_document_metadata</value>
 				</property>
 				<property>
-					<name>input_citation_pmc</name>
-					<value>${workingDir}/mainworkflows_common_import/citation_pmc</value>
-				</property>
-				<property>
 					<name>input_project_concept</name>
 					<value>${workingDir}/mainworkflows_common_import/project-concept</value>
 				</property>
@@ -737,21 +744,9 @@
     <action name="transformers_export_documentmetadata">
         <sub-workflow>
             <app-path>${wf:appPath()}/transformers_export_documentmetadata</app-path>
+            <propagate-configuration/>
             <configuration>
                 <property>
-                    <name>jobTracker</name>
-                    <value>${jobTracker}</value>
-                </property>
-                <property>
-                    <name>nameNode</name>
-                    <value>${nameNode}</value>
-                </property>
-                <property>
-                    <name>queueName</name>
-                    <value>${queueName}</value>
-                </property>
-                <!-- Working directory of the subworkflow -->
-                <property>
                     <name>workingDir</name>
                     <value>${workingDir}/transformers_export_documentmetadata/working_dir</value>
                 </property>
@@ -944,7 +939,28 @@
 					<name>action_set_id_entity_dataset</name>
 					<value>${export_action_set_id_entity_dataset}</value>
 				</property>
+				
 				<property>
+					<name>trust_level_threshold</name>
+					<value>${export_trust_level_threshold}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_referencedProjects</name>
+					<value>${export_trust_level_threshold_document_referencedProjects}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_referencedDatasets</name>
+					<value>${export_trust_level_threshold_document_referencedDatasets}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_classes</name>
+					<value>${export_trust_level_threshold_document_classes}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_pdb</name>
+					<value>${export_trust_level_threshold_document_pdb}</value>
+				</property>
+				<property>
 					<name>action_hbase_remote_zookeeper_quorum</name>
 					<value>${export_action_hbase_remote_zookeeper_quorum}</value>
 				</property>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/java/eu/dnetlib/iis/mainworkflows/importer/mapred/PredefinedTableInputFormat.java
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/java/eu/dnetlib/iis/mainworkflows/importer/mapred/PredefinedTableInputFormat.java	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/java/eu/dnetlib/iis/mainworkflows/importer/mapred/PredefinedTableInputFormat.java	(revision 39164)
@@ -41,7 +41,7 @@
 	
 	public static final String DEFAULT_CHARSET = "utf8";
 	
-	public static final String PART_SEPARATOR = ":";
+	public static final String PART_SEPARATOR = "#";
 	
 	public static class FakeSplit extends InputSplit implements Writable {
 	    public void write(DataOutput out) throws IOException { }
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/workflow.xml	(revision 39164)
@@ -85,10 +85,6 @@
 			<description>input extracted document metadata directory</description>
 		</property>
 		<property>
-			<name>input_citation_pmc</name>
-			<description>input directory holding citations extracted from PMC</description>
-		</property>
-		<property>
 			<name>input_project_concept</name>
 			<description>input project concept directory</description>
 		</property>
@@ -159,7 +155,7 @@
 		</property>
 		<property>
 			<name>output_citation</name>
-			<description>output containing grouped citations coming from citation matching and pmc ingestion</description>			
+			<description>output containing grouped citations coming from citation fuzzy and direct matching modules</description>			
 		</property>
 		<property>
 			<name>output_document_similarity</name>
@@ -693,11 +689,59 @@
     <!-- citation matching part -->
     <decision name="decision-citationmatching">
         <switch>
-            <case to="transformers_citationmatching">${active_citationmatching eq "true"}</case>
+            <case to="transformers_citationmatching_direct">${active_citationmatching eq "true"}</case>
             <default to="skip-citationmatching"/>
         </switch>
     </decision>
     
+    <!-- preparing citation matching input -->
+    <action name="transformers_citationmatching_direct">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_citationmatching_direct</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/transformers_citationmatching_direct/working_dir</value>
+                </property>
+            	<property>
+					<name>input</name>
+					<value>${workingDir}/transformers_metadatamerger/output_merged_metadata</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${workingDir}/transformers_citationmatching_direct/output_citation_metadata</value>
+				</property>
+            </configuration>
+        </sub-workflow>
+		<ok to="citationmatching_direct"/>
+		<error to="fail" />
+    </action>
+    
+    <action name="citationmatching_direct">
+		<sub-workflow>
+            <app-path>${wf:appPath()}/citationmatching_direct</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/citationmatching_direct/working_dir</value>
+                </property>
+                <property>
+					<name>input</name>
+					<value>${workingDir}/transformers_citationmatching_direct/output_citation_metadata</value>
+				</property>
+            	<property>
+					<name>output</name>
+					<value>${workingDir}/citationmatching_direct/output</value>
+				</property>
+			</configuration>
+        </sub-workflow>
+		<ok to="transformers_citationmatching" />
+		<error to="fail" />
+	</action>
+    
+    <!-- preparing citation matching input -->
     <action name="transformers_citationmatching">
 	    <sub-workflow>
             <app-path>${wf:appPath()}/transformers_citationmatching</app-path>
@@ -748,24 +792,190 @@
 		        </property>
             </configuration>
         </sub-workflow>
+		<ok to="transformers_citations_from_matching"/>
+		<error to="fail" />
+    </action>
+        
+    <!-- normalize and group citations part -->
+    <action name="transformers_citations_from_matching">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_citations_from_matching</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/transformers_citations_from_matching/working_dir</value>
+                </property>
+            	<property>
+					<name>input</name>
+					<value>${workingDir}/citationmatching_chain/output</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${workingDir}/transformers_citations_from_matching/output</value>
+				</property>
+            </configuration>
+        </sub-workflow>
+		<ok to="transformers_citations_from_ingestpmc"/>
+		<error to="fail" />
+    </action>
+    
+    <action name="transformers_citations_from_ingestpmc">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_citations_from_ingestpmc</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/transformers_citations_from_ingestpmc/working_dir</value>
+                </property>
+            	<property>
+					<name>input</name>
+					<value>${workingDir}/citationmatching_direct/output</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${workingDir}/transformers_citations_from_ingestpmc/output</value>
+				</property>
+            </configuration>
+        </sub-workflow>
+		<ok to="transformers_citations_from_referencemetadata"/>
+		<error to="fail" />
+    </action>
+    
+    <action name="transformers_citations_from_referencemetadata">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_citations_from_referencemetadata</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/transformers_citations_from_referencemetadata/working_dir</value>
+                </property>
+            	<property>
+					<name>input</name>
+					<value>${workingDir}/transformers_metadatamerger/output_merged_metadata</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${workingDir}/transformers_citations_from_referencemetadata/output</value>
+				</property>
+            </configuration>
+        </sub-workflow>
+		<ok to="citations_union"/>
+		<error to="fail" />
+    </action>
+    
+    <action name="citations_union">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_common_union3</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/citations_union/working_dir</value>
+                </property>
+            	<property>
+					<name>input_a</name>
+					<value>${workingDir}/transformers_citations_from_ingestpmc/output</value>
+				</property>
+				<property>
+					<name>input_b</name>
+					<value>${workingDir}/transformers_citations_from_matching/output</value>
+				</property>
+				<property>
+					<name>input_c</name>
+					<value>${workingDir}/transformers_citations_from_referencemetadata/output</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${workingDir}/citations_union/output</value>
+				</property>
+				<property>
+					<name>schema</name>
+					<value>eu.dnetlib.iis.common.citations.schemas.Citation</value>
+				</property>
+            </configuration>
+        </sub-workflow>
+        <ok to="citations_collapser"/>
+		<error to="fail" />
+    </action>
+    
+    <action name="citations_collapser">
+        <sub-workflow>
+            <app-path>${wf:appPath()}/collapsers_basic_collapser</app-path>
+            <propagate-configuration/>
+            <configuration>
+                <property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/citations_collapser/working_dir</value>
+                </property>
+                <property>
+                    <name>blocking_field</name>
+                    <value>sourceDocumentId</value>
+                </property>
+                <property>
+                    <name>record_collapser</name>
+                    <value>eu.dnetlib.iis.collapsers.basic.GenericCitationCollapser</value>
+        		</property>
+                <property>
+                    <name>schema</name>
+                    <value>eu.dnetlib.iis.common.citations.schemas.Citation</value>
+                </property>
+                <!-- Input ports. -->
+                <property>
+                    <name>input</name>
+                    <value>${workingDir}/citations_union/output</value>
+                </property>
+                <!-- Output port bound to given path -->
+                <property>
+                    <name>output</name>
+                    <value>${workingDir}/citations_collapser/output</value>
+                </property>
+            </configuration>
+        </sub-workflow>
+        <ok to="transformers_export_citations"/>
+        <error to="fail"/>
+    </action>
+    
+    <action name="transformers_export_citations">
+	    <sub-workflow>
+            <app-path>${wf:appPath()}/transformers_export_citations</app-path>
+            <propagate-configuration/>
+            <configuration>
+            	<property>
+                    <name>workingDir</name>
+                    <value>${workingDir}/transformers_export_citations/working_dir</value>
+                </property>
+            	<property>
+					<name>input</name>
+					<value>${workingDir}/citations_collapser/output</value>
+				</property>
+				<property>
+					<name>output</name>
+					<value>${output_citation}</value>
+				</property>
+            </configuration>
+        </sub-workflow>
 		<ok to="decision-documentssimilarity"/>
 		<error to="fail" />
     </action>
-        
+    
+    <!-- end of normalize and group citations part -->
     <action name="skip-citationmatching">
         <java>
 			<prepare>
 				<!-- notice: directory have to aligned with skipped action output -->
-				<delete path="${nameNode}${workingDir}/citationmatching_chain" />
-				<mkdir path="${nameNode}${workingDir}/citationmatching_chain" />
+				<delete path="${nameNode}${workingDir}/transformers_export_citations" />
+				<mkdir path="${nameNode}${workingDir}/transformers_export_citations" />
 			</prepare>
 			<main-class>eu.dnetlib.iis.core.java.ProcessWrapper</main-class>
 			<arg>eu.dnetlib.iis.core.java.jsonworkflownodes.Producer</arg>
-            <arg>-C{citation,
-				eu.dnetlib.iis.citationmatching.schemas.Citation,
+            <arg>-C{citations,
+				eu.dnetlib.iis.export.schemas.Citations,
 				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
             <!-- notice: directory have to aligned with skipped action output -->
-            <arg>-Ocitation=${workingDir}/citationmatching_chain/output</arg>
+            <arg>-Ocitations=${output_citation}</arg>
         </java>
         <ok to="decision-documentssimilarity"/>
         <error to="fail"/>
@@ -979,7 +1189,7 @@
 				</property>
             </configuration>
         </sub-workflow>
-		<ok to="transformers_citations_from_matching"/>
+		<ok to="end"/>
 		<error to="fail" />
     </action>
     
@@ -1022,135 +1232,12 @@
             <arg>-Oglobal_statistics=${workingDir}/statistics/output_global_statistics</arg>
              -->
         </java>
-        <ok to="transformers_citations_from_matching"/>
+        <ok to="end"/>
         <error to="fail"/>
     </action>
     <!-- end of statistics part -->
+
     
-    <!-- normalize and group citations part -->
-    <action name="transformers_citations_from_matching">
-	    <sub-workflow>
-            <app-path>${wf:appPath()}/transformers_citations_from_matching</app-path>
-            <propagate-configuration/>
-            <configuration>
-            	<property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/transformers_citations_from_matching/working_dir</value>
-                </property>
-            	<property>
-					<name>input</name>
-					<value>${workingDir}/citationmatching_chain/output</value>
-				</property>
-				<property>
-					<name>output</name>
-					<value>${workingDir}/transformers_citations_from_matching/output</value>
-				</property>
-            </configuration>
-        </sub-workflow>
-		<ok to="transformers_citations_from_ingestpmc"/>
-		<error to="fail" />
-    </action>
-    
-    <action name="transformers_citations_from_ingestpmc">
-	    <sub-workflow>
-            <app-path>${wf:appPath()}/transformers_citations_from_ingestpmc</app-path>
-            <propagate-configuration/>
-            <configuration>
-            	<property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/transformers_citations_from_ingestpmc/working_dir</value>
-                </property>
-            	<property>
-					<name>input</name>
-					<value>${input_citation_pmc}</value>
-				</property>
-				<property>
-					<name>output</name>
-					<value>${workingDir}/transformers_citations_from_ingestpmc/output</value>
-				</property>
-            </configuration>
-        </sub-workflow>
-		<ok to="citations_collapser"/>
-		<error to="fail" />
-    </action>
-    
-    <action name="citations_collapser">
-		<sub-workflow>
-            <app-path>${wf:appPath()}/collapsers_multiple_input_collapser</app-path>
-            <propagate-configuration/>
-            <configuration>
-                <property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/citations_collapser/working_dir</value>
-                </property>
-                <!-- Input ports & parameters. -->
-                <property>
-                    <name>origin_1</name>
-                    <value>ingested</value>
-                </property>
-                <property>
-                    <name>input_1</name>
-                    <value>${workingDir}/transformers_citations_from_ingestpmc/output</value>
-                </property>
-                <property>
-                    <name>origin_2</name>
-                    <value>matched</value>
-                </property>
-                <property>
-                    <name>input_2</name>
-                    <value>${workingDir}/transformers_citations_from_matching/output</value>
-                </property>
-                <property>
-                    <name>blocking_field</name>
-                    <value>sourceDocumentId</value>
-                </property>
-                <property>
-                    <name>schema_input</name>
-                    <value>eu.dnetlib.iis.common.citations.schemas.Citation</value>
-                </property>
-                <property>
-                    <name>output</name>
-                    <value>${workingDir}/citations_collapser/output</value>
-                </property>
-                <property>
-                    <name>schema_input_envelope</name>
-                    <value>eu.dnetlib.iis.common.citations.schemas.CitationEnvelope</value>
-                </property>
-                <property>
-                    <name>record_collapser</name>
-                    <value>eu.dnetlib.iis.collapsers.origins.PMCCitationCollapser</value>
-        		</property>
-            </configuration>
-        </sub-workflow>
-		<ok to="transformers_export_citations"/>
-		<error to="fail" />
-    </action>
-    
-    <action name="transformers_export_citations">
-	    <sub-workflow>
-            <app-path>${wf:appPath()}/transformers_export_citations</app-path>
-            <propagate-configuration/>
-            <configuration>
-            	<property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/transformers_export_citations/working_dir</value>
-                </property>
-            	<property>
-					<name>input</name>
-					<value>${workingDir}/citations_collapser/output</value>
-				</property>
-				<property>
-					<name>output</name>
-					<value>${output_citation}</value>
-				</property>
-            </configuration>
-        </sub-workflow>
-		<ok to="end"/>
-		<error to="fail" />
-    </action>
-    
-    <!-- end of normalize and group citations part -->
-    
 	<kill name="fail">
 		<message>Unfortunately, the process failed -- error message:
 			[${wf:errorMessage(wf:lastErrorNode())}]</message>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/import.txt
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/import.txt	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/import.txt	(revision 39164)
@@ -8,13 +8,9 @@
 ingest_html_plaintext classpath eu/dnetlib/iis/ingest/html/plaintext/oozie_app
 ingest_pmc_plaintext classpath eu/dnetlib/iis/ingest/pmc/plaintext/oozie_app
 ingest_pmc_metadata classpath eu/dnetlib/iis/ingest/pmc/metadata/oozie_app
-ingest_pmc_citations classpath eu/dnetlib/iis/transformers/ingest/pmc/citations/oozie_app
-basic_collapser classpath eu/dnetlib/iis/collapsers/basic_collapser/oozie_app
 multiple_input_collapser classpath eu/dnetlib/iis/collapsers/multiple_input_collapser/oozie_app
 metadataextraction classpath eu/dnetlib/iis/metadataextraction/oozie_app
 metadataextraction_cached classpath eu/dnetlib/iis/mainworkflows/metadataextraction/cached_by_checksum/oozie_app
 transformers_common_union4 classpath eu/dnetlib/iis/transformers/common/union4/oozie_app
 transformers_idextractor classpath eu/dnetlib/iis/transformers/importer/documentmetadata/idextractor/oozie_app
-transformers_externalidtooaid classpath eu/dnetlib/iis/transformers/importer/documentmetadata/externalidtooaid/oozie_app
-transformers_ingest_pmc_metadata classpath eu/dnetlib/iis/transformers/ingest/pmc/metadata/oozie_app
-ingest_pmc_idmapping_pmidtooaid classpath eu/dnetlib/iis/ingest/pmc/idmapping/pmidtooaid/oozie_app
\ No newline at end of file
+transformers_ingest_pmc_metadata classpath eu/dnetlib/iis/transformers/ingest/pmc/metadata/oozie_app
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/metadataextraction/extracted_document_metadata.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/metadataextraction/extracted_document_metadata.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/metadataextraction/extracted_document_metadata.json	(revision 39164)
@@ -4,7 +4,9 @@
 	"abstract": "The aim of this paper is to present video quality prediction models for objective non-intrusive, prediction of H.264 encoded video for all content types combining parameters both in the physical and application layer over Universal Mobile Telecommunication Systems (UMTS) networks. In order to characterize the Quality of Service (QoS) level, a learning model based on Adaptive Neural Fuzzy Inference System (ANFIS) and a second model based on non-linear regression analysis is proposed to predict the video quality in terms of the Mean Opinion Score (MOS). The objective of the paper is two-fold. First, to find the impact of QoS parameters on end-to-end video quality for H.264 encoded video. Second, to develop learning models based on ANFIS and nonlinear regression analysis to predict video quality over UMTS networks by considering the impact of radio link loss models. The loss models considered are 2-state Markov models. Both the models are trained with a combination of physical and application layer parameters and validated with unseen dataset. Preliminary results show that good prediction accuracy was obtained from both the models. The work should help in the development of a reference-free video prediction model and QoS control methods for video over UMTS networks.",
 	"language": "eng",
 	"keywords": null,
-	"externalIdentifiers": null, 
+	"externalIdentifiers": {
+            "pmid": "1234567"
+    }, 
 	"journal": "International Journal of Digital Multimedia Broadcasting", 
 	"year": null, 	
 	"publisher": null,
@@ -13,7 +15,8 @@
  	"affiliations": null,
 	"volume": "19", 
 	"issue": "2",
-	"pages": {"start": "121", "end": "132"}
+	"pages": {"start": "121", "end": "132"},
+	"publicationTypeName": null
 }
 {	
 	"id": "id-2", 
@@ -30,7 +33,8 @@
  	"affiliations": null,
 	"volume": "3", 
 	"issue": null,
-	"pages": {"start": "4428", "end": "4445"}
+	"pages": {"start": "4428", "end": "4445"},
+	"publicationTypeName": null
 }
 {	
 	"id": "id-3", 
@@ -60,11 +64,33 @@
 					"start": "803", 
 					"end": "826"
 				}, 
-				"location": null
+				"location": null,
+				"externalIds": null
 			}, 
 			"text": "J. Abernethy, F. Bach, T. Evgeniou, and J.-P. Vert. A new approach to collaborative filtering: Operator estimation with spectral regularization. Journal of Machine Learning Research, 10:803-826, 2009."
 		},
 		{
+			"position": 3, 
+			"basicMetadata": {
+				"publisher": null, 
+				"title": "Four new derivatives of the broad-host range cloning vector pBBR1MCS, carrying different antibiotic resistance cassettes.", 
+				"url": null, 
+				"series": null, 
+				"authors": ["Kovach, M.E.", "Elzer, P.H.", "Hill, D.S.", "Robertson, G.T.", "Farris, M.A.", "Roop, R.M.", "Peterson, K.M."], 
+				"volume": null, 
+				"edition": null, 
+				"source": null, 
+				"year": null, 
+				"issue": null, 
+				"pages": null, 
+				"location": null,
+				"externalIds": {
+					"pmid": "1234567"
+			    }
+			}, 
+			"text": "Kovach, M.E., Elzer, P.H., Hill, D.S., Robertson, G.T., Farris, M.A., Roop, R.M., Peterson, K.M.. Four new derivatives of the broad-host range cloning vector pBBR1MCS, carrying different antibiotic resistance cassettes. Gene. 1995; 166: 175-176"
+		},
+		{
 			"position": 9, 
 			"basicMetadata": {
 				"publisher": null, 
@@ -78,7 +104,8 @@
 				"year": "2008", 
 				"issue": null, 
 				"pages": null, 
-				"location": null
+				"location": null,
+				"externalIds": null
 			}, 
 			"text": "F. Bach. Exploring large feature spaces with hierarchical multiple kernel learning. In Advances in Neural Information Processing Systems (NIPS), 2008."
 		}
@@ -87,5 +114,6 @@
  	"affiliations": null,
 	"volume": null, 
 	"issue": "0",
-	"pages": {"start": "69", "end": "110"}
+	"pages": {"start": "69", "end": "110"},
+	"publicationTypeName": null
 }
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/project.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/project.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/project.json	(revision 39164)
@@ -1,2 +1,2 @@
-{"id":"WT::08616","projectAcronym":"","projectGrantId":"08616","fundingClass":"WT"}
-{"id":"ec::226639","projectAcronym":"INTIF","projectGrantId":"226639","fundingClass":"FP7"}
\ No newline at end of file
+{"id":"WT::08616","projectAcronym":"","projectGrantId":"08616","fundingClass":"WT::WT"}
+{"id":"ec::226639","projectAcronym":"INTIF","projectGrantId":"226639","fundingClass":"EC::FP7"}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/document_classes.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/document_classes.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/document_classes.json	(revision 39164)
@@ -76,7 +76,7 @@
           "Arts \u0026 recreation",
           "Sports, games \u0026 entertainment"
         ],
-        "confidenceLevel": 0.613
+        "confidenceLevel": 0.595
       },
       {
         "classLabels": [
@@ -97,7 +97,7 @@
           "Arts \u0026 recreation",
           "Music"
         ],
-        "confidenceLevel": 0.525
+        "confidenceLevel": 0.508
       },
       {
         "classLabels": [
@@ -104,7 +104,7 @@
           "Arts \u0026 recreation",
           "Arts"
         ],
-        "confidenceLevel": 0.472
+        "confidenceLevel": 0.455
       }
     ],
     "meshEuroPMCClasses": [
@@ -265,7 +265,7 @@
           "Science",
           "Physics"
         ],
-        "confidenceLevel": 0.951
+        "confidenceLevel": 0.945
       },
       {
         "classLabels": [
@@ -272,7 +272,7 @@
           "Technology",
           "Technology"
         ],
-        "confidenceLevel": 0.93
+        "confidenceLevel": 0.927
       },
       {
         "classLabels": [
@@ -279,7 +279,7 @@
           "Technology",
           "Chemical engineering"
         ],
-        "confidenceLevel": 0.79
+        "confidenceLevel": 0.78
       }
     ],
     "meshEuroPMCClasses": [
@@ -426,7 +426,7 @@
           "Science",
           "Mathematics"
         ],
-        "confidenceLevel": 0.957
+        "confidenceLevel": 0.954
       },
       {
         "classLabels": [
@@ -433,7 +433,7 @@
           "Computer science, information \u0026 general works",
           "Computer science, knowledge \u0026 systems"
         ],
-        "confidenceLevel": 0.948
+        "confidenceLevel": 0.942
       },
       {
         "classLabels": [
@@ -440,7 +440,7 @@
           "Social sciences",
           "Statistics"
         ],
-        "confidenceLevel": 0.939
+        "confidenceLevel": 0.936
       },
       {
         "classLabels": [
@@ -447,7 +447,7 @@
           "Social sciences",
           "Law"
         ],
-        "confidenceLevel": 0.56
+        "confidenceLevel": 0.542
       },
       {
         "classLabels": [
@@ -454,7 +454,7 @@
           "Science",
           "Chemistry"
         ],
-        "confidenceLevel": 0.35
+        "confidenceLevel": 0.333
       }
     ],
     "meshEuroPMCClasses": [
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/citations.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/citations.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/output/citations.json	(revision 39164)
@@ -2,24 +2,27 @@
   "documentId": "id-3",
   "citations": [
     {
-      "rawText": "F. Bach. Exploring large feature spaces with hierarchical multiple kernel learning. In Advances in Neural Information Processing Systems (NIPS), 2008.",
-      "destinationDocumentId": "id-4",
-      "confidenceLevel": 0.7486356,
-      "externalDestinationDocumentIds": {}
-    },
-    {
+      "position": 1,
       "rawText": "J. Abernethy, F. Bach, T. Evgeniou, and J.-P. Vert. A new approach to collaborative filtering: Operator estimation with spectral regularization. Journal of Machine Learning Research, 10:803-826, 2009.",
       "destinationDocumentId": null,
       "confidenceLevel": null,
       "externalDestinationDocumentIds": {}
     },
-	{
+    {
+      "position": 3,
       "rawText": "Kovach, M.E., Elzer, P.H., Hill, D.S., Robertson, G.T., Farris, M.A., Roop, R.M., Peterson, K.M.. Four new derivatives of the broad-host range cloning vector pBBR1MCS, carrying different antibiotic resistance cassettes. Gene. 1995; 166: 175-176",
-      "destinationDocumentId": "pmc-id",
+      "destinationDocumentId": "id-1",
       "confidenceLevel": 1.0,
       "externalDestinationDocumentIds": {
-            "pmid": "1234567"
+        "pmid": "1234567"
       }
-	}  
+    },
+    {
+      "position": 9,
+      "rawText": "F. Bach. Exploring large feature spaces with hierarchical multiple kernel learning. In Advances in Neural Information Processing Systems (NIPS), 2008.",
+      "destinationDocumentId": "id-4",
+      "confidenceLevel": 0.7486356,
+      "externalDestinationDocumentIds": {}
+    }
   ]
 }
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/statistics/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/statistics/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/statistics/oozie_app/workflow.xml	(revision 39164)
@@ -283,10 +283,6 @@
 					<value>${workingDir}/mainworkflows_common_import/metadataimport</value>
 				</property>
 				<property>
-					<name>output_citation_pmc</name>
-					<value>${workingDir}/mainworkflows_common_import/citation_pmc</value>
-				</property>
-				<property>
 					<name>output_dataset</name>
 					<value>${workingDir}/mainworkflows_common_import/dataset</value>
 				</property>
@@ -295,10 +291,6 @@
 					<value>${workingDir}/mainworkflows_common_import/dataset_to_mdstore</value>
 				</property>
 				<property>
-					<name>output_citation_pmc</name>
-					<value>${workingDir}/mainworkflows_common_import/citation_pmc</value>
-				</property>
-				<property>
 					<name>output_document_text</name>
 					<value>${workingDir}/mainworkflows_common_import/document-text</value>
 				</property>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/primary/processing/oozie_app/workflow.xml	(revision 39164)
@@ -62,9 +62,6 @@
 			<arg>-C{document_text_wos,
 				eu.dnetlib.iis.metadataextraction.schemas.DocumentText,
 				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
-			<arg>-C{citation,
-				eu.dnetlib.iis.ingest.pmc.citations.schemas.Citation,
-				eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/meta/citation_pmc.json}</arg>
 			<arg>-C{document_text_classpath,
 				eu.dnetlib.iis.mainworkflows.schemas.DocumentContentClasspath,
 				eu/dnetlib/iis/mainworkflows/integration/primary/processing/input/metadataextraction/document_text_classpath.json}</arg>
@@ -77,7 +74,6 @@
             <arg>-Odataset=${workingDir}/producer/dataset</arg>
             <arg>-Oextracted_document_metadata=${workingDir}/producer/extracted_document_metadata</arg>
             <arg>-Odocument_text_wos=${workingDir}/producer/document_text_wos</arg>
-            <arg>-Ocitation=${workingDir}/producer/citation</arg>
             <arg>-Odocument_text_classpath=${workingDir}/producer/document_text_classpath</arg>           
         </java>
         <ok to="document_text_producer"/>
@@ -263,10 +259,6 @@
 					<name>input_extracted_document_metadata</name>
 					<value>${workingDir}/producer/extracted_document_metadata</value>
 				</property>
-				<property>
-					<name>input_citation_pmc</name>
-					<value>${workingDir}/producer/citation</value>
-				</property>
                 <property>
                     <name>output_document_to_project</name>
                     <value>${workingDir}/exported/document_to_project</value>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person#body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person#body	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1/person#body	(revision 39164)
@@ -0,0 +1,29 @@
+{
+	kind: entity
+  	entity: {
+    type: person
+    id: "30|0314fe20-be3c-4bc3-adee-6bbc2cde3cb7_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=::oai:DiVA.org:uu-127423_Oliveira__Paulo_UNKNOWN"
+    person: {
+      metadata: {
+        firstname: {
+        	value: "Oliveira, Paulo"
+        }
+        fullname: {
+        	value: "Oliveira, Paulo"
+        }
+      }
+    }
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "0.9"
+    provenanceaction: {
+      classid: "UNKNOWN"
+      classname: "UNKNOWN"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1360248058786
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project#body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project#body	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1/project#body	(revision 39164)
@@ -0,0 +1,58 @@
+{
+  kind: entity
+  entity: {
+    type: project
+    id: "40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43"
+    project: {
+      metadata: {
+        code: {
+        	value: "241544"
+        }
+        acronym: {
+        	value: "SYSKID"
+        }
+        title: {
+        	value: "Systems biology towards novel chronic kidney disease diagnosis and treatment"
+        }
+        startdate: {
+        	value: "2010-01-01"
+        }
+        enddate: {
+        	value: "2014-12-31"
+        }
+        callidentifier: {
+        	value: "FP7-HEALTH-2009-single-stage"
+        }
+        ecsc39: {
+        	value: "true"
+        }
+        contracttype: {
+          classid: "CP"
+          classname: "Collaborative project"
+          schemeid: "ec:FP7contractTypes"
+          schemename: "ec:FP7contractTypes"
+        }
+        fundingtree: {
+        	value: "<fundingtree><funder><id>ec__________::EC</id><shortname>EC</shortname><name>European Commission</name><jurisdiction>EU</jurisdiction></funder><funding_level_2><id>ec__________::EC::FP7::SP1::HEALTH</id><description>Health</description><name>HEALTH</name><class>ec:program</class><parent><funding_level_1><id>ec__________::EC::FP7::SP1</id><description>SP1-Cooperation</description><name>SP1</name><class>ec:specificprogram</class><parent><funding_level_0><id>ec__________::EC::FP7</id><description>SEVENTH FRAMEWORK PROGRAMME</description><name>FP7</name><parent/><class>ec:frameworkprogram</class></funding_level_0></parent></funding_level_1></parent></funding_level_2></fundingtree>"
+        }
+      }
+    }
+    originalId: "corda_______::241544"
+    collectedfrom: {
+      key: "10|openaire____::b30dac7baac631f3da7c2bb18dd9891f"
+      value: "CORDA - COmmon Research DAta Warehouse"
+    }
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "0.9"
+    provenanceaction: {
+      classid: "sysimport:crosswalk:entityregistry"
+      classname: "sysimport:crosswalk:entityregistry"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372675091270
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/mappings.properties
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/mappings.properties	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/mappings.properties	(revision 39164)
@@ -1,5 +1,5 @@
-eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1=person:body
-eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1=project:body
-eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article=result:body,resultProject_outcome_isProducedBy:40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43,personResult_authorship_hasAuthor:30|crossref____::7c844171342140b6133fb0536dba9843,personResult_authorship_hasAuthor:30|crossref____::f6813047fd08021c87acdee2061c20f4
-eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset=result:body
-eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup=result:body,resultResult_dedup_merges:50|od______1106::8477827a014277dfebb0d5882496a797
+eu/dnetlib/iis/mainworkflows/integration/import/input/meta/person/1=person#body
+eu/dnetlib/iis/mainworkflows/integration/import/input/meta/project/1=project#body
+eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article=result#body,resultProject_outcome_isProducedBy#40_corda_________ced15df040f56f2ff3d011e9f0b4bc43,personResult_authorship_hasAuthor#30_crossref______7c844171342140b6133fb0536dba9843,personResult_authorship_hasAuthor#30_crossref______f6813047fd08021c87acdee2061c20f4
+eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset=result#body
+eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup=result#body,resultResult_dedup_merges#50_od______1106__8477827a014277dfebb0d5882496a797
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result#body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result#body	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/result#body	(revision 39164)
@@ -0,0 +1,85 @@
+{
+  kind: entity
+  entity: {
+    type: result
+    id: "50|dedup_wf_001::0154f41ff22d1ac2ef656d2931ac828c"
+    result: {
+      metadata: {
+        title: {
+          value: "Soldadura entre gr\\303\\241nulos"
+          qualifier: {
+            classid: "main title"
+            classname: "main title"
+            schemeid: "dnet:dataCite_title"
+            schemename: "dnet:dataCite_title"
+          }
+        }
+        dateofacceptance: {
+          value: "2011-01-01"
+        }
+        resulttype: {
+          classid: "publication"
+          classname: "publication"
+          schemeid: "dnet:result_typologies"
+          schemename: "dnet:result_typologies"
+        }
+        storagedate: { 
+        	value: "2012-10-18"
+        }
+        language: {
+          classid: "und"
+          classname: "Undetermined"
+          schemeid: "dnet:languages"
+          schemename: "dnet:languages"
+        }
+      }
+      
+      instance: {
+	    licence: {
+	      classid: "OPEN"
+	      classname: "Open Access"
+	      schemeid: "dnet:access_modes"
+	      schemename: "dnet:access_modes"
+	    }
+	    instancetype: {
+	      classid: "0001"
+	      classname: "Article"
+	      schemeid: "dnet:publication_resource"
+	      schemename: "dnet:publication_resource"
+	    }
+	    hostedby: {
+	      key: "10|opendoar____::9766527f2b5d3e95d4a733fcfb77bd7e"
+	      value: "INRIA a CCSD electronic archive server"
+	    }
+	    url: "http://hal.archives-ouvertes.fr/hal-00613125"
+	  }
+
+    }
+    originalId: "crossref____::003b0746ef72ff253ef1e465c758c961"
+    collectedfrom: {
+      key: "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2"
+      value: "Crossref"
+    }
+    pid: {
+      value: "doi:10.1002/prca.201000155"
+      qualifier: {
+        classid: "doi"
+        classname: "doi"
+        schemeid: "dnet:pid_types"
+        schemename: "dnet:pid_types"
+      }
+    }
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "NEUTRAL"
+    provenanceaction: {
+      classid: "user:claim:doi"
+      classname: "user:claim:doi"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372359095914
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges#50_od______1106__8477827a014277dfebb0d5882496a797
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges#50_od______1106__8477827a014277dfebb0d5882496a797	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dedup/resultResult_dedup_merges#50_od______1106__8477827a014277dfebb0d5882496a797	(revision 39164)
@@ -0,0 +1,35 @@
+{
+  kind: relation
+  rel: {
+    relType: resultResult
+    source: "50|dedup_wf_001::0154f41ff22d1ac2ef656d2931ac828c"
+    target: "50|od______1106::8477827a014277dfebb0d5882496a797"
+    child: false
+    resultResult: {
+      dedup: {
+	      relMetadata: {
+	        semantics: {
+	          classid: "merges"
+	          classname: "merges"
+	          schemeid: "dnet:result_result_relations"
+	          schemename: "dnet:result_result_relations"
+	        }
+	      }
+	   }
+    }
+    subRelType: dedup
+    relClass: "merges"
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "0.8"
+    provenanceaction: {
+      classid: ""
+      classname: ""
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1423870324129
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result#body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result#body	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/result#body	(revision 39164)
@@ -0,0 +1,85 @@
+{
+  kind: entity
+  entity: {
+    type: result
+    id: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
+    result: {
+      metadata: {
+        title: {
+          value: "Human urinary peptide database for multiple disease biomarker discovery"
+          qualifier: {
+            classid: "main title"
+            classname: "main title"
+            schemeid: "dnet:dataCite_title"
+            schemename: "dnet:dataCite_title"
+          }
+        }
+        dateofacceptance: {
+          value: "2011-01-01"
+        }
+        resulttype: {
+          classid: "publication"
+          classname: "publication"
+          schemeid: "dnet:result_typologies"
+          schemename: "dnet:result_typologies"
+        }
+        storagedate: { 
+        	value: "2012-10-18"
+        }
+        language: {
+          classid: "und"
+          classname: "Undetermined"
+          schemeid: "dnet:languages"
+          schemename: "dnet:languages"
+        }
+      }
+      
+      instance: {
+	    licence: {
+	      classid: "OPEN"
+	      classname: "Open Access"
+	      schemeid: "dnet:access_modes"
+	      schemename: "dnet:access_modes"
+	    }
+	    instancetype: {
+	      classid: "0001"
+	      classname: "Article"
+	      schemeid: "dnet:publication_resource"
+	      schemename: "dnet:publication_resource"
+	    }
+	    hostedby: {
+	      key: "10|opendoar____::9766527f2b5d3e95d4a733fcfb77bd7e"
+	      value: "INRIA a CCSD electronic archive server"
+	    }
+	    url: "http://hal.archives-ouvertes.fr/hal-00613125"
+	  }
+
+    }
+    originalId: "crossref____::003b0746ef72ff253ef1e465c758c961"
+    collectedfrom: {
+      key: "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2"
+      value: "Crossref"
+    }
+    pid: {
+      value: "doi:10.1002/prca.201000155"
+      qualifier: {
+        classid: "doi"
+        classname: "doi"
+        schemeid: "dnet:pid_types"
+        schemename: "dnet:pid_types"
+      }
+    }
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "NEUTRAL"
+    provenanceaction: {
+      classid: "user:claim:doi"
+      classname: "user:claim:doi"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372359095914
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______f6813047fd08021c87acdee2061c20f4
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______f6813047fd08021c87acdee2061c20f4	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______f6813047fd08021c87acdee2061c20f4	(revision 39164)
@@ -0,0 +1,36 @@
+{
+  kind: relation
+  rel: {
+    relType: personResult
+    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
+    target: "30|crossref____::f6813047fd08021c87acdee2061c20f4"
+    child: false
+    personResult: {
+      authorship: {
+      		relMetadata: {
+        		semantics: {
+          			classid: "hasAuthor"
+          			classname: "hasAuthor"
+          			schemeid: "dnet:personroles"
+          			schemename: "dnet:personroles"
+        		}
+      		}
+      		ranking: "5"
+    	}
+    }
+    subRelType: authorship
+  	relClass: "hasAuthor"
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "NEUTRAL"
+    provenanceaction: {
+      classid: "user:claim:doi"
+      classname: "user:claim:doi"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372359095915
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______7c844171342140b6133fb0536dba9843
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______7c844171342140b6133fb0536dba9843	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/personResult_authorship_hasAuthor#30_crossref______7c844171342140b6133fb0536dba9843	(revision 39164)
@@ -0,0 +1,36 @@
+{
+  kind: relation
+  rel: {
+    relType: personResult
+    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
+    target: "30|crossref____::7c844171342140b6133fb0536dba9843"
+    child: false
+    personResult: {
+      authorship: {
+      		relMetadata: {
+        		semantics: {
+          			classid: "hasAuthor"
+          			classname: "hasAuthor"
+          			schemeid: "dnet:personroles"
+          			schemename: "dnet:personroles"
+        		}
+      		}
+      		ranking: "4"
+    	}
+  	}
+  	subRelType: authorship
+  	relClass: "hasAuthor"
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "NEUTRAL"
+    provenanceaction: {
+      classid: "user:claim:doi"
+      classname: "user:claim:doi"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372359095915
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy#40_corda_________ced15df040f56f2ff3d011e9f0b4bc43
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy#40_corda_________ced15df040f56f2ff3d011e9f0b4bc43	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/article/resultProject_outcome_isProducedBy#40_corda_________ced15df040f56f2ff3d011e9f0b4bc43	(revision 39164)
@@ -0,0 +1,35 @@
+{
+  kind: relation
+  rel: {
+    relType: resultProject
+    source: "50|crossref____::003b0746ef72ff253ef1e465c758c961"
+    target: "40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43"
+    child: false
+    resultProject: {
+      outcome: {
+	      relMetadata: {
+	        semantics: {
+	          classid: "isProducedBy"
+	          classname: "isProducedBy"
+	          schemeid: "dnet:result_project_relations"
+	          schemename: "dnet:result_project_relations"
+	        }
+	      }
+	   }
+    }
+    subRelType: outcome
+    relClass: "isProducedBy"
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "0.8"
+    provenanceaction: {
+      classid: ""
+      classname: ""
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1372359095915
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result#body
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result#body	(nonexistent)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/input/meta/result/dataset/result#body	(revision 39164)
@@ -0,0 +1,85 @@
+{
+  kind: entity
+  entity: {
+    type: result
+    id: "50|od______1106::138537e0568c27c402756042b15e7858"
+    result: {
+      metadata: {
+        title: {
+          value: "Santa Rosa [ciruelo]"
+          qualifier: {
+            classid: "main title"
+            classname: "main title"
+            schemeid: "dnet:dataCite_title"
+            schemename: "dnet:dataCite_title"
+          }
+        }
+        dateofacceptance: {
+          value: "1964-12-01"
+        }
+        resulttype: {
+          classid: "publication"
+          classname: "publication"
+          schemeid: "dnet:result_typologies"
+          schemename: "dnet:result_typologies"
+        }
+        storagedate: { 
+        	value: "2012-10-18"
+        }
+        language: {
+          classid: "und"
+          classname: "Undetermined"
+          schemeid: "dnet:languages"
+          schemename: "dnet:languages"
+        }
+      }
+      
+      instance: {
+	    licence: {
+	      classid: "OPEN"
+	      classname: "Open Access"
+	      schemeid: "dnet:access_modes"
+	      schemename: "dnet:access_modes"
+	    }
+	    instancetype: {
+	      classid: "0021"
+	      classname: "Dataset"
+	      schemeid: "dnet:publication_resource"
+	      schemename: "dnet:publication_resource"
+	    }
+	    hostedby: {
+	      key: "10|opendoar____::c9f95a0a5af052bffce5c89917335f67"
+	      value: "Digital.CSIC"
+	    }
+	    url: "http://hdl.handle.net/10261/86687"
+	  }
+
+    }
+    originalId: "oai:digital.csic.es:10261/86687"
+    collectedfrom: {
+      key: "10|opendoar____::c9f95a0a5af052bffce5c89917335f67"
+      value: "Digital.CSIC"
+    }
+    pid: {
+      value: "oai:digital.csic.es:10261/86687"
+      qualifier: {
+        classid: "oai"
+        classname: "Open Archives Initiative"
+        schemeid: "dnet:pid_types"
+        schemename: "dnet:pid_types"
+      }
+    }
+  }
+  dataInfo: {
+    inferred: false
+    deletedbyinference: false
+    trust: "0.9"
+    provenanceaction: {
+      classid: "sysimport:crosswalk:repository"
+      classname: "sysimport:crosswalk:repository"
+      schemeid: "dnet:provenanceActions"
+      schemename: "dnet:provenanceActions"
+    }
+  }
+  timestamp: 1423856239322
+}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/output/project.json
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/output/project.json	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/test/resources/eu/dnetlib/iis/mainworkflows/integration/import/output/project.json	(revision 39164)
@@ -1 +1 @@
-{"id":"40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43","projectAcronym":"SYSKID","projectGrantId":"241544","fundingClass":"FP7"}
\ No newline at end of file
+{"id":"40|corda_______::ced15df040f56f2ff3d011e9f0b4bc43","projectAcronym":"SYSKID","projectGrantId":"241544","fundingClass":"EC::FP7"}
\ No newline at end of file
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/job.properties
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/job.properties	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/job.properties	(revision 39164)
@@ -1,11 +1,11 @@
 #iis cluster
 #PMC
-#input=/share/import/doc_content_url/europePMC/2014-06-19
-#default_cache_location=/cache/plaintext/europePMC/
+input=/share/import/doc_content_url/europePMC/2015-07-07
+default_cache_location=/cache/plaintext/europePMC/
 
 #wos
-input=/share/import/doc_content_url/wos/2014-06-19
-default_cache_location=/cache/plaintext/wos/
+#input=/share/import/doc_content_url/wos/2014-06-19
+#default_cache_location=/cache/plaintext/wos/
 
 output=${workingDir}/out
 
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached_by_checksum/oozie_app/workflow.xml	(revision 39164)
@@ -89,26 +89,7 @@
 					<name>output</name>
 					<value>${workingDir}/mainworkflows_importer_plaintext_cached/out</value>
 				</property>
-				<property>
-					<name>content_connection_timeout</name>
-					<value>${content_connection_timeout}</value>
-				</property>
-				<property>
-					<name>content_read_timeout</name>
-					<value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>zk_session_timeout</name>
-					<value>${zk_session_timeout}</value>
-				</property>
-				<property>
-					<name>default_cache_location</name>
-					<value>${default_cache_location}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="postprocessing-text"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/importer/plaintext/cached/oozie_app/workflow.xml	(revision 39164)
@@ -149,21 +149,10 @@
 					<value>${workingDir}/transformers_importer_plaintext_skip_extracted/tobeprocessed_content</value>
 				</property>
 				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
-				<property>
 					<name>output</name>
 					<value>${workingDir}/importer_plaintext/output</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="transformers_common_union_plaintext_merge_outputs"/>
@@ -300,26 +289,7 @@
                     <name>workingDir</name>
                     <value>${workingDir}/importer_plaintext/working_dir</value>
                 </property>
-            	<property>
-					<name>input</name>
-					<value>${input}</value>
-				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
-				<property>
-					<name>output</name>
-					<value>${output}</value>
-				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="obtain-lock_for_initializing"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached_by_checksum/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached_by_checksum/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached_by_checksum/oozie_app/workflow.xml	(revision 39164)
@@ -115,46 +115,7 @@
 					<name>output_root</name>
 					<value>${workingDir}/mainworkflows_metadataextraction_cached/out</value>
 				</property>
-				<property>
-					<name>excluded_ids</name>
-					<value>${excluded_ids}</value>
-				</property>
-				<property>
-					<name>max_file_size_mb</name>
-					<value>${max_file_size_mb}</value>
-				</property>
-				<property>
-					<name>content_connection_timeout</name>
-					<value>${content_connection_timeout}</value>
-				</property>
-				<property>
-					<name>content_read_timeout</name>
-					<value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>zk_session_timeout</name>
-					<value>${zk_session_timeout}</value>
-				</property>
-				<property>
-					<name>default_cache_location</name>
-					<value>${default_cache_location}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
-				<property>
-					<name>output_name_meta</name>
-					<value>${output_name_meta}</value>
-				</property>
-				<property>
-					<name>output_name_plaintext</name>
-					<value>${output_name_plaintext}</value>
-				</property>
-				<property>
-					<name>output_name_fault</name>
-					<value>${output_name_fault}</value>
-				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="postprocessing-forking"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/metadataextraction/cached/oozie_app/workflow.xml	(revision 39164)
@@ -201,41 +201,10 @@
 					<value>${workingDir}/transformers_metadataextraction_skip_extracted/tobeprocessed_content</value>
 				</property>
 				<property>
-					<name>excluded_ids</name>
-					<value>${excluded_ids}</value>
-				</property>
-				<property>
-					<name>max_file_size_mb</name>
-					<value>${max_file_size_mb}</value>
-				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
-				<property>
-					<name>output_name_meta</name>
-					<value>${output_name_meta}</value>
-				</property>
-				<property>
-					<name>output_name_plaintext</name>
-					<value>${output_name_plaintext}</value>
-				</property>
-				<property>
-					<name>output_name_fault</name>
-					<value>${output_name_fault}</value>
-				</property>
-				<property>
 					<name>output_root</name>
 					<value>${workingDir}/metadata_extractor/output_root</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="merge_outputs"/>
@@ -482,46 +451,7 @@
                     <name>workingDir</name>
                     <value>${workingDir}/metadata_extractor/working_dir</value>
                 </property>
-            	<property>
-					<name>input</name>
-					<value>${input}</value>
-				</property>
-				<property>
-					<name>excluded_ids</name>
-					<value>${excluded_ids}</value>
-				</property>
-				<property>
-					<name>max_file_size_mb</name>
-					<value>${max_file_size_mb}</value>
-				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
-					<name>mapred_max_split_size</name>
-					<value>${mapred_max_split_size}</value>
-				</property>
-				<property>
-					<name>output_name_meta</name>
-					<value>${output_name_meta}</value>
-				</property>
-				<property>
-					<name>output_name_plaintext</name>
-					<value>${output_name_plaintext}</value>
-				</property>
-				<property>
-					<name>output_name_fault</name>
-					<value>${output_name_fault}</value>
-				</property>
-				<property>
-					<name>output_root</name>
-					<value>${output_root}</value>
-				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="obtain-lock_for_initializing"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/main/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/main/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/main/oozie_app/workflow.xml	(revision 39164)
@@ -166,6 +166,23 @@
 			<value>$UNDEFINED$</value>
 			<description>external hbase zookeeper client port, required only whe zookeeper quorum property is set</description>
 		</property>
+		<!-- trust level threshold section -->
+		<property>
+			<name>export_trust_level_threshold</name>
+			<value>$UNDEFINED$</value>
+			<description>default trust level threshold of exported data</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_referencedProjects</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedProjects trust level threshold</description>
+		</property>
+		<property>
+			<name>export_trust_level_threshold_document_referencedDatasets</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedDatasets trust level threshold</description>
+		</property>
+		<!--  -->
 		<!-- working directory related -->
 		<property>
 			<name>execution_environment</name>
@@ -294,19 +311,7 @@
 					<name>content_read_timeout</name>
 					<value>${import_content_read_timeout}</value>
 				</property>
-				<!-- metadata extraction related -->
-				<property>
-					<name>metadataextraction_excluded_checksums</name>
-					<value>${metadataextraction_excluded_checksums}</value>
-				</property>
-				<property>
-					<name>metadataextraction_max_file_size_mb</name>
-					<value>${metadataextraction_max_file_size_mb}</value>
-				</property>
-				<property>
-					<name>metadataextraction_default_cache_location</name>
-					<value>${metadataextraction_default_cache_location}</value>
-				</property>
+				<!-- metadata extraction related are autmatically propagated-->
 				<!-- output parameters -->
 				<property>
 					<name>output_extracted_document_metadata</name>
@@ -572,6 +577,18 @@
 					<value>${export_action_set_id_entity_dataset}</value>
 				</property>
 				<property>
+					<name>trust_level_threshold</name>
+					<value>${export_trust_level_threshold}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_referencedProjects</name>
+					<value>${export_trust_level_threshold_document_referencedProjects}</value>
+				</property>
+				<property>
+					<name>trust_level_threshold_document_referencedDatasets</name>
+					<value>${export_trust_level_threshold_document_referencedDatasets}</value>
+				</property>
+				<property>
 					<name>action_hbase_remote_zookeeper_quorum</name>
 					<value>${export_action_hbase_remote_zookeeper_quorum}</value>
 				</property>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/import/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/import/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/preprocessing/import/oozie_app/workflow.xml	(revision 39164)
@@ -190,130 +190,7 @@
 					<name>active_import_concept</name>
 					<value>true</value>
 				</property>
-				<!-- import project related -->
-				<property>
-					<name>database_service_location</name>
-					<value>${database_service_location}</value>
-				</property>
-				<property>
-					<name>database_dbname</name>
-					<value>${database_dbname}</value>
-				</property>
-				<!-- import datacite related -->
-				<property>
-					<name>mdstore_service_location</name>
-					<value>${mdstore_service_location}</value>
-				</property>
-				<property>
-					<name>dataset_mdstore_ids_csv</name>
-					<value>${dataset_mdstore_ids_csv}</value>
-				</property>
-				<!-- import content related -->
-				<property>
-					<name>objectstore_service_location</name>
-					<value>${objectstore_service_location}</value>
-				</property>
-				<property>
-					<name>approved_objectstores_csv</name>
-					<value>${approved_objectstores_csv}</value>
-				</property>
-				<property>
-					<name>mimetypes_pdf</name>
-					<value>${mimetypes_pdf}</value>
-				</property>
-				<property>
-					<name>mimetypes_text</name>
-					<value>${mimetypes_text}</value>
-				</property>
-				<property>
-					<name>mimetypes_html</name>
-					<value>${mimetypes_html}</value>
-				</property>
-				<property>
-					<name>mimetypes_xml_pmc</name>
-					<value>${mimetypes_xml_pmc}</value>
-				</property>
-				<property>
-					<name>mimetypes_wos</name>
-					<value>${mimetypes_wos}</value>
-				</property>
-				<!-- import timeouts related -->
-				<property>
-					<name>resultset_client_read_timeout</name>
-					<value>${resultset_client_read_timeout}</value>
-				</property>
-				<property>
-					<name>content_connection_timeout</name>
-					<value>${content_connection_timeout}</value>
-				</property>
-				<property>
-					<name>content_read_timeout</name>
-					<value>${content_read_timeout}</value>
-				</property>
-				<!-- metadata extraction related -->
-				<property>
-					<name>metadataextraction_excluded_checksums</name>
-					<value>${metadataextraction_excluded_checksums}</value>
-				</property>
-				<property>
-					<name>metadataextraction_max_file_size_mb</name>
-					<value>${metadataextraction_max_file_size_mb}</value>
-				</property>
-				<property>
-					<name>metadataextraction_default_cache_location</name>
-					<value>${metadataextraction_default_cache_location}</value>
-				</property>
-				<!-- metadata import output subdirectory names -->
-				<property>
-					<name>metadataimport_output_name_project</name>
-					<value>${metadataimport_output_name_project}</value>
-				</property>
-				<!-- project concept related -->
-				<property>
-					<name>islookup_service_location</name>
-					<value>${islookup_service_location}</value>
-				</property>
-				<property>
-					<name>project_concepts_context_ids_csv</name>
-					<value>${project_concepts_context_ids_csv}</value>
-				</property>
-				<!-- output parameters -->
-				<property>
-					<name>output_extracted_document_metadata</name>
-					<value>${output_extracted_document_metadata}</value>
-				</property>
-				<property>
-					<name>output_metadataimport_root</name>
-					<value>${output_metadataimport_root}</value>
-				</property>
-				<property>
-					<name>output_dataset</name>
-					<value>${output_dataset}</value>
-				</property>
-				<property>
-					<name>output_dataset_to_mdstore</name>
-					<value>${output_dataset_to_mdstore}</value>
-				</property>
-				<property>
-					<name>output_citation_pmc</name>
-					<value>${workingDir}/citation_pmc</value>
-				</property>
-				<property>
-					<name>output_document_text</name>
-					<value>${output_document_text}</value>
-				</property>
-				<property>
-					<name>output_wos</name>
-					<value>${output_wos}</value>
-				</property>
-				<property>
-					<name>output_project_concept</name>
-					<value>${output_project_concept}</value>
-				</property>
-				<property>
-					<name>output_faults</name>
-					<value>${output_faults}</value>
-				</property>
+				<!-- all the other properties autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_joining" />
@@ -329,10 +206,6 @@
                     <name>workingDir</name>
                     <value>${workingDir}/wos_url_import/working_dir</value>
                 </property>
-                <property>
-					<name>objectstore_service_location</name>
-					<value>${objectstore_service_location}</value>
-				</property>
 				<property>
 					<name>approved_objectstores_csv</name>
 					<value>${wos_plaintext_objectstores_csv}</value>
@@ -345,14 +218,7 @@
 					<name>output_name_wos</name>
 					<value>wos</value>
 				</property>
-				<property>
-					<name>mimetypes_wos</name>
-					<value>${mimetypes_wos}</value>
-				</property>
-				<property>
-					<name>resultset_client_read_timeout</name>
-					<value>${resultset_client_read_timeout}</value>
-				</property>
+				<!-- all the other properties autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="wos_import_plaintext" />
@@ -372,18 +238,11 @@
 					<name>input</name>
 					<value>${workingDir}/wos_url_import/imported/wos</value>
 				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${output_wos_text}</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_joining" />
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/job.properties
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/job.properties	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/main/job.properties	(revision 39164)
@@ -29,8 +29,12 @@
 import_content_objectstores_csv=794e8173-8be3-4f51-a12e-b43d12ab3b7d_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl
 #arxiv content
 #import_content_objectstores_csv=258755af-0b48-41ee-9652-939c5bd2fca3_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl
-#pmc content
-#import_content_objectstores_csv=b2b6fca5-ce18-498c-a375-b02df97998f0_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl
+<<<<<<< .working
+=======
+#pmc content new id
+#not sure xmls were cured
+#import_content_objectstores_csv=f23cf47f-50d4-4932-9f31-8a81dae3a645_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl
+>>>>>>> .merge-right.r39127
 #wos content
 #import_content_objectstores_csv=a1a35f9d-dc12-44e0-8781-d8273f5ef017_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl
 #all contents (including wos)
@@ -42,14 +46,21 @@
 
 #metadataextraction related
 metadataextraction_excluded_checksums=1e5b574109da731f4918c7f91fc24864
+<<<<<<< .working
 metadataextraction_default_cache_location=/user/mhorst/cache/metadataextraction_20150414
+=======
+>>>>>>> .merge-right.r39127
 
+metadataextraction_default_cache_location=/cache/metadataextraction_20150904
+
 #processing modes
 active_metadataextraction_export=false
 active_referenceextraction_project=true
 active_referenceextraction_dataset=false
+active_referenceextraction_pdb=false
 active_referenceextraction_researchinitiative=false
 active_documentsclassification=false
+
 active_documentssimilarity=false
 active_citationmatching=false
 active_statistics=false
@@ -76,5 +87,8 @@
 
 #need to disable fork-join test due to 'decision' related problem causing: Error: E0743 : E0743: Multiple "ok to" transitions to the same node, [transformers_common_union_document_text], are not allowed
 oozie.wf.validate.ForkJoin=false
+<<<<<<< .working
 #required to include all oozie-sharelib-* dependecies
-oozie.use.system.libpath=true
\ No newline at end of file
+oozie.use.system.libpath=true=======
+
+remove_sideproducts=false>>>>>>> .merge-right.r39127
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/import.txt
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/import.txt	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/primary/processing/oozie_app/import.txt	(revision 39164)
@@ -1,7 +1,9 @@
 ## This is a classpath-based import file (this header is required)
 transformers_metadatamerger classpath eu/dnetlib/iis/transformers/metadatamerger/oozie_app
-transformers_citationmatching classpath eu/dnetlib/iis/transformers/citationmatching/oozie_app
+transformers_citationmatching classpath eu/dnetlib/iis/transformers/citationmatching/fuzzy/oozie_app
+transformers_citationmatching_direct classpath eu/dnetlib/iis/transformers/citationmatching/direct/oozie_app
 citationmatching_chain classpath eu/dnetlib/iis/citationmatching/chain/oozie_app
+citationmatching_direct classpath eu/dnetlib/iis/citationmatching/direct/oozie_app
 transformers_statistics classpath eu/dnetlib/iis/transformers/statistics/oozie_app
 referenceextraction_project classpath eu/dnetlib/iis/referenceextraction/project/main/oozie_app
 referenceextraction_dataset classpath eu/dnetlib/iis/referenceextraction/dataset/main/oozie_app
@@ -14,8 +16,11 @@
 documentssimilarity_chain classpath eu/dnetlib/iis/documentssimilarity/chain/oozie_app
 statistics classpath eu/dnetlib/iis/statistics/main/oozie_app
 collapsers_multiple_input_collapser classpath eu/dnetlib/iis/collapsers/multiple_input_collapser/oozie_app
+collapsers_basic_collapser classpath eu/dnetlib/iis/collapsers/basic_collapser/oozie_app
 transformers_citations_from_matching classpath eu/dnetlib/iis/transformers/common/citations/from/citationmatching/oozie_app
 transformers_citations_from_ingestpmc classpath eu/dnetlib/iis/transformers/common/citations/from/ingest.pmc/oozie_app
+transformers_citations_from_referencemetadata classpath eu/dnetlib/iis/transformers/common/citations/from/referencemetadata/oozie_app
 transformers_common_union classpath eu/dnetlib/iis/transformers/common/union/oozie_app
+transformers_common_union3 classpath eu/dnetlib/iis/transformers/common/union3/oozie_app
 transformers_export_citations classpath eu/dnetlib/iis/transformers/export/citations/oozie_app
 transformers_project_toconcept classpath eu/dnetlib/iis/transformers/referenceextraction/project/toconcept/oozie_app
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/export/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/export/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/export/oozie_app/workflow.xml	(revision 39164)
@@ -172,7 +172,34 @@
 			<value>$UNDEFINED$</value>
 			<description>action-set identifier of exported data containing dataset entities</description>
 		</property>
+		<!-- trust level threshold section -->
 		<property>
+			<name>trust_level_threshold</name>
+			<value>$UNDEFINED$</value>
+			<description>default trust level threshold of exported data</description>
+		</property>
+		<property>
+			<name>trust_level_threshold_document_classes</name>
+			<value>$UNDEFINED$</value>
+			<description>document_classes trust level threshold</description>
+		</property>
+		<property>
+			<name>trust_level_threshold_document_referencedProjects</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedProjects trust level threshold</description>
+		</property>
+		<property>
+			<name>trust_level_threshold_document_referencedDatasets</name>
+			<value>$UNDEFINED$</value>
+			<description>document_referencedDatasets trust level threshold</description>
+		</property>
+		<property>
+			<name>trust_level_threshold_document_pdb</name>
+			<value>$UNDEFINED$</value>
+			<description>document to protein databank trust level threshold</description>
+		</property>
+		<!--  -->
+		<property>
 			<name>action_hbase_remote_zookeeper_quorum</name>
 			<value>$UNDEFINED$</value>
 			<description>external hbase zookeeper quorum, set to empty value by default which means data will be exported to local hbase instance</description>
@@ -216,143 +243,6 @@
                     <name>workingDir</name>
                     <value>${workingDir}/export_actionmanager/working_dir</value>
                 </property>
-                <property>
-					<name>input_document_metadata</name>
-					<value>${input_document_metadata}</value>
-				</property>
-				<property>
-					<name>input_document_to_project</name>
-					<value>${input_document_to_project}</value>
-				</property>
-				<property>
-					<name>input_document_to_project_concepts</name>
-					<value>${input_document_to_project_concepts}</value>
-				</property>
-				<property>
-					<name>input_document_to_dataset</name>
-					<value>${input_document_to_dataset}</value>
-				</property>
-				<property>
-					<name>input_document_to_research_initiatives</name>
-					<value>${input_document_to_research_initiatives}</value>
-				</property>
-				<property>
-					<name>input_document_to_pdb</name>
-					<value>${input_document_to_pdb}</value>
-				</property>
-				<property>
-					<name>input_document_to_document_classes</name>
-					<value>${input_document_to_document_classes}</value>
-				</property>
-				<property>
-					<name>input_citations</name>
-					<value>${input_citations}</value>
-				</property>
-				<property>
-					<name>input_document_similarity</name>
-					<value>${input_document_similarity}</value>
-				</property>
-				<property>
-					<name>input_document_statistics</name>
-					<value>${input_document_statistics}</value>
-				</property>
-				<property>
-					<name>input_author_statistics</name>
-					<value>${input_author_statistics}</value>
-				</property>
-				<property>
-					<name>input_project_statistics</name>
-					<value>${input_project_statistics}</value>
-				</property>
-				<property>
-					<name>input_document_websiteusage_similarity</name>
-					<value>${input_document_websiteusage_similarity}</value>
-				</property>
-				<!-- action managed related -->				
-				<property>
-					<name>action_hbase_table_name</name>
-					<value>${action_hbase_table_name}</value>
-				</property>
-				<property>
-					<name>action_hbase_table_initialize</name>
-					<value>${action_hbase_table_initialize}</value>
-				</property>
-				<property>
-					<name>action_set_id</name>
-					<value>${action_set_id}</value>
-				</property>
-				<property>
-					<name>action_set_id_dataset_similarities_websiteusage</name>
-					<value>${action_set_id_dataset_similarities_websiteusage}</value>
-				</property>
-				<property>
-					<name>action_set_id_person_similarities_websiteusage</name>
-					<value>${action_set_id_person_similarities_websiteusage}</value>
-				</property>
-				<property>
-					<name>action_set_id_person_statistics</name>
-					<value>${action_set_id_person_statistics}</value>
-				</property>
-				<property>
-					<name>action_set_id_project_statistics</name>
-					<value>${action_set_id_project_statistics}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_similarities_standard</name>
-					<value>${action_set_id_document_similarities_standard}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_similarities_websiteusage</name>
-					<value>${action_set_id_document_similarities_websiteusage}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_affiliations</name>
-					<value>${action_set_id_document_affiliations}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_statistics</name>
-					<value>${action_set_id_document_statistics}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_classes</name>
-					<value>${action_set_id_document_classes}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_referencedProjects</name>
-					<value>${action_set_id_document_referencedProjects}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_referencedDatasets</name>
-					<value>${action_set_id_document_referencedDatasets}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_referencedDocuments</name>
-					<value>${action_set_id_document_referencedDocuments}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_research_initiative</name>
-					<value>${action_set_id_document_research_initiative}</value>
-				</property>
-				<property>
-					<name>action_set_id_document_pdb</name>
-					<value>${action_set_id_document_pdb}</value>
-				</property>
-				<property>
-					<name>action_hbase_remote_zookeeper_quorum</name>
-					<value>${action_hbase_remote_zookeeper_quorum}</value>
-				</property>
-				<property>
-					<name>action_hbase_remote_zookeeper_clientport</name>
-					<value>${action_hbase_remote_zookeeper_clientport}</value>
-				</property>
-				<property>
-					<name>documentssimilarity_threshold</name>
-					<value>${documentssimilarity_threshold}</value>
-				</property>
-				<property>
-					<name>referenceextraction_pdb_url_root</name>
-					<value>${referenceextraction_pdb_url_root}</value>
-				</property>
             </configuration>
         </sub-workflow>
 		<ok to="export_entities_forking"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/workflow.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/workflow.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/src/main/resources/eu/dnetlib/iis/mainworkflows/common/import/oozie_app/workflow.xml	(revision 39164)
@@ -188,10 +188,6 @@
 			<description>metadata importer output root directory, required when ${active_import_metadata}=true</description>
 		</property>
 		<property>
-			<name>output_citation_pmc</name>
-			<description>PMC citation output directory, required when ${active_import_metadata}=true</description>
-		</property>
-		<property>
 			<name>output_dataset</name>
 			<description>dataset importer output directory holding dataset metadata, required when ${active_import_dataset}=true</description>
 		</property>
@@ -312,26 +308,10 @@
                     <value>${workingDir}/import/working_dir</value>
                 </property>
 				<property>
-					<name>hbase_input_table</name>
-					<value>${hbase_input_table}</value>
-				</property>
-				<property>
 					<name>approved_datasources_csv</name>
 					<value>${hbase_approved_datasources_csv}</value>
 				</property>
 				<property>
-					<name>inference_provenance_blacklist</name>
-					<value>${inference_provenance_blacklist}</value>
-				</property>
-				<property>
-					<name>trust_level_threshold</name>
-					<value>${trust_level_threshold}</value>
-				</property>
-				<property>
-					<name>merge_body_with_updates</name>
-					<value>${merge_body_with_updates}</value>
-				</property>
-				<property>
 					<name>output</name>
 					<value>${output_metadataimport_root}</value>
 				</property>
@@ -356,6 +336,7 @@
 		            <name>output_name_dedup_mapping</name>
 		            <value>${metadataimport_output_name_dedup_mapping}</value>
 		        </property>
+		        <!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="transformers-idextractor" />
@@ -394,22 +375,11 @@
                     <name>workingDir</name>
                     <value>${workingDir}/import_project/working_dir</value>
                 </property>
-                <property>
-					<name>database_service_location</name>
-					<value>${database_service_location}</value>
-				</property>
-				<property>
-					<name>database_name</name>
-					<value>${database_dbname}</value>
-				</property>
-				<property>
-					<name>resultset_client_read_timeout</name>
-					<value>${resultset_client_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${output_metadataimport_root}/${metadataimport_output_name_project}</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="decision-import_content_url" />
@@ -432,26 +402,11 @@
                     <name>workingDir</name>
                     <value>${workingDir}/import_dataset/working_dir</value>
                 </property>
-                <property>
-					<name>mdstore_service_location</name>
-					<value>${mdstore_service_location}</value>
-				</property>
 				<property>
 					<name>mdstore_ids_csv</name>
 					<value>${dataset_mdstore_ids_csv}</value>
 				</property>
-				<property>
-					<name>resultset_client_read_timeout</name>
-					<value>${resultset_client_read_timeout}</value>
-				</property>
-            	<property>
-					<name>output_dataset</name>
-					<value>${output_dataset}</value>
-				</property>
-				<property>
-					<name>output_dataset_to_mdstore</name>
-					<value>${output_dataset_to_mdstore}</value>
-				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_joining" />
@@ -525,39 +480,7 @@
                     <name>workingDir</name>
                     <value>${workingDir}/import_content_url/working_dir</value>
                 </property>
-                <property>
-					<name>objectstore_service_location</name>
-					<value>${objectstore_service_location}</value>
-				</property>
 				<property>
-					<name>approved_objectstores_csv</name>
-					<value>${approved_objectstores_csv}</value>
-				</property>
-				<property>
-					<name>mimetypes_pdf</name>
-					<value>${mimetypes_pdf}</value>
-				</property>
-				<property>
-					<name>mimetypes_text</name>
-					<value>${mimetypes_text}</value>
-				</property>
-				<property>
-					<name>mimetypes_html</name>
-					<value>${mimetypes_html}</value>
-				</property>
-				<property>
-					<name>mimetypes_xml_pmc</name>
-					<value>${mimetypes_xml_pmc}</value>
-				</property>
-				<property>
-					<name>mimetypes_wos</name>
-					<value>${mimetypes_wos}</value>
-				</property>
-				<property>
-					<name>resultset_client_read_timeout</name>
-					<value>${resultset_client_read_timeout}</value>
-				</property>
-				<property>
 					<name>input_id</name>
 					<value>${wf:actionData('input_id-path-setter')['result']}</value>
 				</property>
@@ -589,6 +512,7 @@
 					<name>output_name_wos</name>
 					<value>wos</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_urlbased_forking" />
@@ -641,18 +565,11 @@
 					<name>input</name>
 					<value>${workingDir}/import_content_url/imported/text</value>
 				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${workingDir}/import_plaintext/imported</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_urlbased_joining" />
@@ -672,18 +589,11 @@
 					<name>input</name>
 					<value>${workingDir}/import_content_url/imported/wos</value>
 				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${output_wos}</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="import_urlbased_joining" />
@@ -703,18 +613,11 @@
 					<name>input</name>
 					<value>${workingDir}/import_content_url/imported/xmlpmc</value>
 				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${workingDir}/import_plaintext_pmc/imported</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="ingest_pmc_forking" />
@@ -752,38 +655,11 @@
 	<decision name="decision-ingest_pmc_metadata">
         <switch>
         	<!-- define ingest_pmc_metadata_joining here when introducing pmc metadata ingestion -->
-            <case to="transformers-doitooaid">${active_import_metadata eq "true" and active_ingest_pmc eq "true"}</case>
-            <default to="skip-ingest_pmc_citations"/>
+            <case to="ingest_pmc_metadata">${active_import_metadata eq "true" and active_ingest_pmc eq "true"}</case>
+            <default to="skip-ingest_pmc_metadata"/>
         </switch>
     </decision>
 
-	<action name="transformers-doitooaid">
-        <sub-workflow>
-            <app-path>${wf:appPath()}/transformers_externalidtooaid</app-path>
-            <propagate-configuration/>
-            <configuration>
-                <property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/transformers_doitooaid/working_dir</value>
-                </property>
-                <property>
-                    <name>input_document_metadata</name>
-                    <value>${output_metadataimport_root}/${metadataimport_output_name_document_meta}</value>
-                </property>
-                <property>
-                    <name>external_id_type</name>
-                    <value>doi</value>
-                </property>
-                <property>
-                    <name>output</name>
-                    <value>${workingDir}/transformers_doitooaid/out</value>
-                </property>
-            </configuration>
-        </sub-workflow>
-        <ok to="ingest_pmc_metadata"/>
-        <error to="fail"/>
-    </action>
-
 	<action name="ingest_pmc_metadata">
         <sub-workflow>
             <app-path>${wf:appPath()}/ingest_pmc_metadata</app-path>
@@ -803,41 +679,6 @@
                 </property>
             </configuration>
         </sub-workflow>
-		<ok to="collapse_pmc_metadata"/>
-        <error to="fail"/>
-    </action>
-
-	<action name="collapse_pmc_metadata">
-        <sub-workflow>
-            <app-path>${wf:appPath()}/basic_collapser</app-path>
-            <propagate-configuration/>
-            <configuration>
-                <property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/collapse_pmc_metadata/working_dir</value>
-                </property>
-                <property>
-                    <name>input</name>
-                    <value>${workingDir}/ingest_pmc_metadata/out</value>
-                </property>
-                <property>
-                    <name>output</name>
-                    <value>${workingDir}/collapse_pmc_metadata/out</value>
-                </property>
-                <property>
-                    <name>schema</name>
-                    <value>eu.dnetlib.iis.ingest.pmc.metadata.schemas.ExtractedDocumentMetadata</value>
-                </property>
-                <property>
-                    <name>blocking_field</name>
-                    <value>id</value>
-                </property>
-                <property>
-                    <name>significant_fields</name>
-                    <value>journal,references,pages</value>
-                </property>
-            </configuration>
-        </sub-workflow>
 		<ok to="transformers_ingest_pmc_metadata"/>
         <error to="fail"/>
     </action>
@@ -853,7 +694,7 @@
                 </property>
                 <property>
                     <name>input</name>
-                    <value>${workingDir}/collapse_pmc_metadata/out</value>
+                    <value>${workingDir}/ingest_pmc_metadata/out</value>
                 </property>
                 <property>
                     <name>output</name>
@@ -861,89 +702,23 @@
                 </property>
             </configuration>
         </sub-workflow>
-		<ok to="ingest_pmc_idmapping_pmidtooaid"/>
+		<ok to="ingest_pmc_joining"/>
         <error to="fail"/>
     </action>
 
-	<action name="ingest_pmc_idmapping_pmidtooaid">
-        <sub-workflow>
-            <app-path>${wf:appPath()}/ingest_pmc_idmapping_pmidtooaid</app-path>
-            <propagate-configuration/>
-            <configuration>
-                <property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/ingest_pmc_idmapping_pmidtooaid/working_dir</value>
-                </property>
-                <property>
-                    <name>input</name>
-                    <value>${workingDir}/collapse_pmc_metadata/out</value>
-                </property>
-                <property>
-                    <name>output</name>
-                    <value>${workingDir}/ingest_pmc_idmapping_pmidtooaid/out</value>
-                </property>
-            </configuration>
-        </sub-workflow>
-		<ok to="ingest_pmc_citations"/>
-        <error to="fail"/>
-    </action>
-    
-	<action name="ingest_pmc_citations">
-		<sub-workflow>
-            <app-path>${wf:appPath()}/ingest_pmc_citations</app-path>
-            <propagate-configuration/>
-            <configuration>
-            	<property>
-                    <name>workingDir</name>
-                    <value>${workingDir}/ingest_pmc_citations/working_dir</value>
-                </property>
-                <property>
-					<name>input_extracted_document_metadata</name>
-					<value>${workingDir}/collapse_pmc_metadata/out</value>
-				</property>
-				<property>
-					<name>input_dedup_map</name>
-					<value>${output_metadataimport_root}/${metadataimport_output_name_dedup_mapping}</value>
-				</property>
-				<property>
-                    <name>input_doi_to_oaid</name>
-                    <value>${workingDir}/transformers_doitooaid/out</value>
-                </property>
-                <property>
-                    <name>input_pmid_to_oaid</name>
-                    <value>${workingDir}/ingest_pmc_idmapping_pmidtooaid/out</value>
-                </property>
-            	<property>
-					<name>output_citation</name>
-					<value>${output_citation_pmc}</value>
-				</property>
-			</configuration>
-        </sub-workflow>
-		<ok to="ingest_pmc_joining" />
-		<error to="fail" />
-	</action>
-
-	<action name="skip-ingest_pmc_citations">
+	<action name="skip-ingest_pmc_metadata">
         <java>
 			<prepare>
 				<!-- notice: directory have to aligned with skipped action output -->
-				<delete path="${nameNode}${workingDir}/ingest_pmc_citations" />
 				<delete path="${nameNode}${workingDir}/transformers_ingest_pmc_metadata"/>
-				<delete path="${nameNode}${output_citation_pmc}"/>
-				<mkdir path="${nameNode}${workingDir}/ingest_pmc_citations" />
 				<mkdir path="${nameNode}${workingDir}/transformers_ingest_pmc_metadata" />
-				<mkdir path="${nameNode}${output_citation_pmc}"/>
 			</prepare>
 			<main-class>eu.dnetlib.iis.core.java.ProcessWrapper</main-class>
 			<arg>eu.dnetlib.iis.core.java.jsonworkflownodes.Producer</arg>
-            <arg>-C{citation_pmc,
-				eu.dnetlib.iis.ingest.pmc.citations.schemas.Citation,
-				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
 				<arg>-C{metadata_pmc,
 				eu.dnetlib.iis.metadataextraction.schemas.ExtractedDocumentMetadata,
 				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
             <!-- notice: directory have to aligned with skipped action output -->
-            <arg>-Ocitation_pmc=${output_citation_pmc}</arg>
             <arg>-Ometadata_pmc=${workingDir}/transformers_ingest_pmc_metadata/out</arg>
         </java>
         <ok to="ingest_pmc_joining"/>
@@ -966,18 +741,11 @@
 					<name>input</name>
 					<value>${workingDir}/import_content_url/imported/html</value>
 				</property>
-				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
             	<property>
 					<name>output</name>
 					<value>${workingDir}/import_html/imported</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
 			</configuration>
         </sub-workflow>
 		<ok to="ingest_html_plaintext" />
@@ -1038,14 +806,6 @@
 					<value>${metadataextraction_max_file_size_mb}</value>
 				</property>
 				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
 					<name>default_cache_location</name>
 					<value>${metadataextraction_default_cache_location}</value>
 				</property>
@@ -1065,6 +825,7 @@
 					<name>output_root</name>
 					<value>${workingDir}/metadata_extractor/out</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="import_urlbased_joining"/>
@@ -1102,14 +863,6 @@
 					<value>${metadataextraction_max_file_size_mb}</value>
 				</property>
 				<property>
-				    <name>content_connection_timeout</name>
-				   <value>${content_connection_timeout}</value>
-				</property>
-				<property>
-				    <name>content_read_timeout</name>
-				   <value>${content_read_timeout}</value>
-				</property>
-				<property>
 					<name>output_name_meta</name>
 					<value>meta</value>
 				</property>
@@ -1125,6 +878,7 @@
 					<name>output_root</name>
 					<value>${workingDir}/metadata_extractor/out</value>
 				</property>
+				<!-- all the other properties are autmatically propagated-->
             </configuration>
         </sub-workflow>
 		<ok to="import_urlbased_joining"/>
Index: modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/pom.xml
===================================================================
--- modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/pom.xml	(revision 39163)
+++ modules/icm-iis-mainworkflows/branches/IIS-CDH-5.3.0/pom.xml	(revision 39164)
@@ -102,6 +102,26 @@
 		</dependency>
 		<dependency>
 			<groupId>eu.dnetlib</groupId>
+			<artifactId>icm-iis-citationmatching-direct</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>jsp-api-2.1</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>servlet-api-2.5</artifactId>
+				</exclusion>
+				<!-- excluding provided libraries -->
+				<exclusion>
+					<groupId>org.apache.hbase</groupId>
+					<artifactId>hbase</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
 			<artifactId>icm-iis-collapsers</artifactId>
 			<version>[1.0.0,2.0.0)</version>
 		</dependency>
