diff --git a/dmp-dataset-templates/AcademyOfFinland.xml b/dmp-dataset-templates/AcademyOfFinland.xml
index e9ce27510..5c4e41324 100644
--- a/dmp-dataset-templates/AcademyOfFinland.xml
+++ b/dmp-dataset-templates/AcademyOfFinland.xml
@@ -16,6 +16,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="what-kinds-data-collected-produced-reused-formats" ordinal="0">
+							<rdaCommonStandard>dataset.type</rdaCommonStandard>
 							<numbering>1.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -35,6 +36,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="consistency-and-quality-data-controlled" ordinal="0">
+							<rdaCommonStandard>dataset.data_quality_assurance</rdaCommonStandard>
 							<numbering>1.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -63,6 +65,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="ethical-issues-sensitive-data-gaining" ordinal="0">
+							<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 							<numbering>2.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -82,6 +85,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="data-ownership-copyright-ipr-issues" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.license.license_ref</rdaCommonStandard>
 							<numbering>2.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -110,6 +114,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="document-data-fair" ordinal="0">
+							<rdaCommonStandard>dataset.metadata.metadata_standard_id</rdaCommonStandard>
 							<numbering>3.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -138,6 +143,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="where-will-data-stored-how-will-backed" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.host.url</rdaCommonStandard>
 							<numbering>4.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -157,6 +163,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-will-be-responsible-how-will-secure" ordinal="0">
+							<rdaCommonStandard>dataset.security_and_privacy.title</rdaCommonStandard>
 							<numbering>4.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -185,6 +192,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="data-openly-published-where-when" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.data_access</rdaCommonStandard>
 							<numbering>5.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -204,6 +212,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="will-data-long-term-value-archived" ordinal="0">
+							<rdaCommonStandard>dataset.preservation_statement</rdaCommonStandard>
 							<numbering>5.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -232,6 +241,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-will-responsible-specific-tasks" ordinal="0">
+							<rdaCommonStandard>dataset.technical_resource.technical_resource.name</rdaCommonStandard>
 							<numbering>6.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
diff --git a/dmp-dataset-templates/FWF.xml b/dmp-dataset-templates/FWF.xml
index 84c5a7986..59d003dde 100644
--- a/dmp-dataset-templates/FWF.xml
+++ b/dmp-dataset-templates/FWF.xml
@@ -14,6 +14,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="what-kinds-of-data-source-code" ordinal="0">
+							<rdaCommonStandard>dataset.type</rdaCommonStandard>
 							<numbering>1.1.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -33,6 +34,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="how-will-the-research-data-be-generated" ordinal="0">
+							<rdaCommonStandard/>
 							<numbering>1.2.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -52,6 +54,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="how-will-you-structure-the-data" ordinal="0">
+							<rdaCommonStandard>dataset.distribution.host.supports_versioning</rdaCommonStandard>
 							<numbering>1.3.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -71,6 +74,7 @@
 					<commentField commentFieldValue="" hasCommentField="false"/>
 					<fields>
 						<field id="who-is-the-target" ordinal="0">
+							<rdaCommonStandard/>
 							<numbering>1.4.1</numbering>
 							<validations/>
 							<defaultValue type="" value=""/>
@@ -101,6 +105,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="will-use-metadata-question" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -116,6 +121,7 @@
 									<data label=""/>
 								</field>
 								<field id="metadata-selector" ordinal="2">
+									<rdaCommonStandard>dataset.metadata.metadata_standard_id</rdaCommonStandard>
 									<numbering>2.1.1.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -126,6 +132,7 @@
 									</data>
 								</field>
 								<field id="other-checkbox-metadata" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>2.1.1.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -149,6 +156,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-metadata" ordinal="1">
+									<rdaCommonStandard>dataset.metadata.metadata_standard_id.identifier</rdaCommonStandard>
 									<numbering>2.1.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -157,6 +165,7 @@
 									<data label="URL where metadata can be found"/>
 								</field>
 								<field id="location-metadata" ordinal="2">
+									<rdaCommonStandard>dataset.metadata.description</rdaCommonStandard>
 									<numbering>2.1.2.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -176,6 +185,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="boolean-metadata-standardized-vocabularies" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -191,6 +201,7 @@
 									<data label=""/>
 								</field>
 								<field id="standardized-vocabularies-autocomplete" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -201,6 +212,7 @@
 									</data>
 								</field>
 								<field id="other-not-listed-items" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>2.1.3.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -224,6 +236,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-other-vocabularies" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>2.1.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -232,6 +245,7 @@
 									<data label=" URL where the vocabularies of the data can be found"/>
 								</field>
 								<field id="desc-other-vocabularies" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>2.1.4.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -262,6 +276,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="openly-accessible-field" ordinal="0">
+											<rdaCommonStandard>dataset.distribution.data_access</rdaCommonStandard>
 											<numbering>2.2.1.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -276,9 +291,9 @@
 											<viewStyle cssClass="" renderstyle="combobox"/>
 											<data label="Select from the list" type="wordlist">
 												<options>
-													<option label="all" source="" value="all"/>
-													<option label="some" source="" value="some"/>
-													<option label="none" source="" value="none"/>
+													<option label="all" source="" uri="" value="all"/>
+													<option label="some" source="" uri="" value="some"/>
+													<option label="none" source="" uri="" value="none"/>
 												</options>
 											</data>
 										</field>
@@ -294,6 +309,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="data-type-openly-accessible" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.format</rdaCommonStandard>
 											<numbering>2.2.1.2.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -302,6 +318,7 @@
 											<data label="Data type"/>
 										</field>
 										<field id="reason-openly-accessible" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.description</rdaCommonStandard>
 											<numbering>2.2.1.2.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -310,6 +327,7 @@
 											<data label="Please specify"/>
 										</field>
 										<field id="url-openly-accessible" ordinal="3">
+											<rdaCommonStandard>dataset.distribution.access_url</rdaCommonStandard>
 											<numbering>2.2.1.2.3</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -329,6 +347,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="data-type-openly-accessible2" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.format</rdaCommonStandard>
 											<numbering>2.2.1.3.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -337,6 +356,7 @@
 											<data label="Data Type"/>
 										</field>
 										<field id="reason-openly-accessible2" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.description</rdaCommonStandard>
 											<numbering>2.2.1.3.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -345,6 +365,7 @@
 											<data label="Please specify"/>
 										</field>
 										<field id="url-openly-accessible2" ordinal="3">
+											<rdaCommonStandard>dataset.distribution.access_url</rdaCommonStandard>
 											<numbering>2.2.1.3.3</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -364,6 +385,7 @@
 									<commentField commentFieldValue="" hasCommentField="true"/>
 									<fields>
 										<field id="repositories223" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.host.title</rdaCommonStandard>
 											<numbering>2.2.1.4.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -374,6 +396,7 @@
 											</data>
 										</field>
 										<field id="not-listed-available" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.1.4.2</numbering>
 											<validations/>
 											<defaultValue type="" value="false"/>
@@ -397,6 +420,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="url223" ordinal="1">
+											<rdaCommonStandard>dataset.distribution.host.url</rdaCommonStandard>
 											<numbering>2.2.1.5.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -405,6 +429,7 @@
 											<data label="URL where the data are stored"/>
 										</field>
 										<field id="name223" ordinal="2">
+											<rdaCommonStandard>dataset.distribution.host.title</rdaCommonStandard>
 											<numbering>2.2.1.5.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -433,6 +458,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="provide-persistent-identifiers" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -456,6 +482,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="persistent-identifiers" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.2.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -463,8 +490,8 @@
 											<viewStyle cssClass="" renderstyle="combobox"/>
 											<data label="Select" type="wordlist">
 												<options>
-													<option label="DOI" source="" value="DOI"/>
-													<option label="Persistent Unique Identifier" source="" value="Persistent Unique Identifier"/>
+													<option label="DOI" source="" uri="" value="DOI"/>
+													<option label="Persistent Unique Identifier" source="" uri="" value="Persistent Unique Identifier"/>
 												</options>
 											</data>
 										</field>
@@ -480,6 +507,7 @@
 									<commentField commentFieldValue="" hasCommentField="true"/>
 									<fields>
 										<field id="provide-searchable-metadata-for-your" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.3.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -503,6 +531,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="search-services-provide-metadata" ordinal="1">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.4.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -513,6 +542,7 @@
 											</data>
 										</field>
 										<field id="not-listed-services-provide-metadata" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.4.2</numbering>
 											<validations/>
 											<defaultValue type="" value="false"/>
@@ -536,6 +566,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="url-not-listed-searchable-metadata" ordinal="1">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.5.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -544,6 +575,7 @@
 											<data label="URL of the services providing searchable metadata"/>
 										</field>
 										<field id="name-not-listed-searchable-metadata" ordinal="2">
+											<rdaCommonStandard/>
 											<numbering>2.2.2.5.2</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -572,6 +604,7 @@
 									<commentField commentFieldValue="" hasCommentField="false"/>
 									<fields>
 										<field id="how-you-planning-document-information-field" ordinal="0">
+											<rdaCommonStandard/>
 											<numbering>2.2.3.1.1</numbering>
 											<validations/>
 											<defaultValue type="" value=""/>
@@ -607,6 +640,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="quality-assurance-processes-will-you-adopt" ordinal="0">
+									<rdaCommonStandard>dataset.data_quality_assurance</rdaCommonStandard>
 									<numbering>2.3.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -626,6 +660,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="consistency-and-quality-of-data-collection" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>2.3.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -663,6 +698,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="what-persistent-identifier-will-used" ordinal="0">
+									<rdaCommonStandard>dataset.type</rdaCommonStandard>
 									<numbering>3.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -691,6 +727,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="will-data-be-preserved-long-term" ordinal="0">
+									<rdaCommonStandard>dataset.preservation_statement</rdaCommonStandard>
 									<numbering>3.2.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -714,6 +751,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-will-not-be-stored" ordinal="0">
+									<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 									<numbering>3.2.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -733,6 +771,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-that-will-be-preserved-long-term" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -759,6 +798,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="data-items-preserved-long-term" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -778,6 +818,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="use-standardized-formats-some-data" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.5.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -804,6 +845,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="standardiseddataformats" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.6.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -814,6 +856,7 @@
 									</data>
 								</field>
 								<field id="other-standardized-format" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.6.2</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -837,6 +880,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="url-of-other-standardized-formats" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.7.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -845,6 +889,7 @@
 									<data label="URL where this information can be found"/>
 								</field>
 								<field id="name-of-other-standardized-formats" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.7.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -864,6 +909,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="url-formats-to-plan-to-store" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -872,6 +918,7 @@
 									<data label=""/>
 								</field>
 								<field id="name-formats-to-plan-to-store" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -880,6 +927,7 @@
 									<data label=""/>
 								</field>
 								<field id="checkbox-formats-to-plan-to-store" ordinal="3">
+									<rdaCommonStandard/>
 									<numbering>3.2.8.3</numbering>
 									<validations/>
 									<defaultValue type="" value="false"/>
@@ -899,6 +947,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="how-data-stored-sufficiently-secure" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.host.storage_type</rdaCommonStandard>
 									<numbering>3.2.9.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -918,6 +967,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="where-data-stored-sufficiently-secure" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.10.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -925,10 +975,10 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select" type="wordlist">
 										<options>
-											<option label="secure with backup and recovery" source="" value="securewithbackupandrecovery"/>
-											<option label="secure with no backup and recovery" source="" value="securewithnobackupandrecovery"/>
-											<option label="insecure with backup and recovery" source="" value="insecurewithbackupandrecovery"/>
-											<option label="insecure with no backup or recovery" source="" value="insecurewithnobackuporrecovery"/>
+											<option label="secure with backup and recovery" source="" uri="" value="securewithbackupandrecovery"/>
+											<option label="secure with no backup and recovery" source="" uri="" value="securewithnobackupandrecovery"/>
+											<option label="insecure with backup and recovery" source="" uri="" value="insecurewithbackupandrecovery"/>
+											<option label="insecure with no backup or recovery" source="" uri="" value="insecurewithnobackuporrecovery"/>
 										</options>
 									</data>
 								</field>
@@ -944,6 +994,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="for-how-long-data-be-stored-3" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.available_till</rdaCommonStandard>
 									<numbering>3.2.11.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -951,9 +1002,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Less than 2 years" source="" value="lessthantwoyears"/>
-											<option label="Up to 5 years" source="" value="uptofiveyears"/>
-											<option label="More than 10 years" source="" value="morethantenyears"/>
+											<option label="Less than 2 years" source="" uri="" value="lessthantwoyears"/>
+											<option label="Up to 5 years" source="" uri="" value="uptofiveyears"/>
+											<option label="More than 10 years" source="" uri="" value="morethantenyears"/>
 										</options>
 									</data>
 								</field>
@@ -969,6 +1020,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="costs-that-need-coverage" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.12.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -988,6 +1040,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="point-during-after-data-stored" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>3.2.13.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1012,6 +1065,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="technical-barriers-making-research-data-accessible" ordinal="0">
+									<rdaCommonStandard>dataset.technical_resource.description</rdaCommonStandard>
 									<numbering>3.2.14.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1049,6 +1103,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="are-there-any-legal-barriers-to-making" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1068,6 +1123,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="who-owns-the-data" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1087,6 +1143,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="what-licence-for-reuse-are-you-planning" ordinal="0">
+									<rdaCommonStandard>dataset.distribution.license.license_ref</rdaCommonStandard>
 									<numbering>4.1.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1108,6 +1165,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="are-there-any-restrinctions-on-the" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.4.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1134,6 +1192,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="how-long-do-you-intend-to-support-data-reuse" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.1.5.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1141,9 +1200,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Less than 2 years" source="" value="Less than 2 years"/>
-											<option label="Up to 5 years" source="" value="Up to 5 years"/>
-											<option label="More than 10 years" source="" value="More than 10 years"/>
+											<option label="Less than 2 years" source="" uri="" value="Less than 2 years"/>
+											<option label="Up to 5 years" source="" uri="" value="Up to 5 years"/>
+											<option label="More than 10 years" source="" uri="" value="More than 10 years"/>
 										</options>
 									</data>
 								</field>
@@ -1159,6 +1218,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="when-do-you-plan-to-make-your-data-available" ordinal="1">
+									<rdaCommonStandard/>
 									<numbering>4.1.6.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1170,16 +1230,17 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="immediately" source="" value="immediately"/>
-											<option label="after article publication" source="" value="after article publication"/>
-											<option label="end of project" source="" value="end of project"/>
-											<option label="later than end of project" source="" value="later than end of project"/>
-											<option label="never" source="" value="never"/>
-											<option label="other" source="" value="other"/>
+											<option label="immediately" source="" uri="" value="immediately"/>
+											<option label="after article publication" source="" uri="" value="after article publication"/>
+											<option label="end of project" source="" uri="" value="end of project"/>
+											<option label="later than end of project" source="" uri="" value="later than end of project"/>
+											<option label="never" source="" uri="" value="never"/>
+											<option label="other" source="" uri="" value="other"/>
 										</options>
 									</data>
 								</field>
 								<field id="other-selection-on-data-available-reuse" ordinal="2">
+									<rdaCommonStandard/>
 									<numbering>4.1.6.2</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1208,6 +1269,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="are-there-any-ethical-barriers-to-making-the-research" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.2.1.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1227,6 +1289,7 @@
 							<commentField commentFieldValue="" hasCommentField="true"/>
 							<fields>
 								<field id="if-applicable-how-deal-with-sensitive-data" ordinal="0">
+									<rdaCommonStandard>dataset.sensitive_data</rdaCommonStandard>
 									<numbering>4.2.2.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>
@@ -1238,9 +1301,9 @@
 									<viewStyle cssClass="" renderstyle="combobox"/>
 									<data label="Select from the list of answers" type="wordlist">
 										<options>
-											<option label="Kept on secure, managed storage for limited time" source="" value="keptonsecure"/>
-											<option label="Kept on insecure, unmanaged storage for limited time" source="" value="keptoninsecure"/>
-											<option label="Delete at end of project" source="" value="deleteatend"/>
+											<option label="Kept on secure, managed storage for limited time" source="" uri="" value="keptonsecure"/>
+											<option label="Kept on insecure, unmanaged storage for limited time" source="" uri="" value="keptoninsecure"/>
+											<option label="Delete at end of project" source="" uri="" value="deleteatend"/>
 										</options>
 									</data>
 								</field>
@@ -1256,6 +1319,7 @@
 							<commentField commentFieldValue="" hasCommentField="false"/>
 							<fields>
 								<field id="DatasetSecuritySectionField2" ordinal="0">
+									<rdaCommonStandard/>
 									<numbering>4.2.3.1</numbering>
 									<validations/>
 									<defaultValue type="" value=""/>