diff --git a/data-repo-compliance/metadata.xml b/data-repo-compliance/metadata.xml
deleted file mode 100644
index c699b66..0000000
--- a/data-repo-compliance/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata version="1">
-    <title>Force11-Open Software</title>
-    <authors>
-        <author>
-            <name>Scholarly Commons Subworking Group 3</name>
-            <affiliation>Force 11</affiliation>
-        </author>
-    </authors>
-    <date>2017-04-23</date>
-    <version>0.2</version>
-</metadata>
diff --git a/data-repo-compliance/policy-model.xml b/data-repo-compliance/policy-model.xml
new file mode 100644
index 0000000..ec44622
--- /dev/null
+++ b/data-repo-compliance/policy-model.xml
@@ -0,0 +1,17 @@
+<policy-model>
+  <title>Force11-Repository Complicance</title>
+  <date>2017-04-23</date>
+  <version>0.2</version>
+  <keywords>repository, open, Force11, software</keywords>
+  <authors>
+    <group>
+      <name>Force 11: Scholarly Commons Subworking Group 3</name>
+    </group>
+  </authors>
+  <model answers-order="yes-first">
+    <space root="DataTags">definitions.ts</space>
+    <graph>questionnaire.dg</graph>
+  </model>
+  <references>
+  </references>
+</policy-model>
diff --git a/data-repo-compliance/questionnaire-dg.pdf b/data-repo-compliance/questionnaire-dg.pdf
new file mode 100644
index 0000000..a3ef559
Binary files /dev/null and b/data-repo-compliance/questionnaire-dg.pdf differ
diff --git a/is-data-FAIR/policy-model.xml b/is-data-FAIR/policy-model.xml
index e69de29..d58e668 100644
--- a/is-data-FAIR/policy-model.xml
+++ b/is-data-FAIR/policy-model.xml
@@ -0,0 +1,17 @@
+<policy-model>
+  <title>Force11-Is the data FAIR?</title>
+  <version>0.2</version>
+  <date>2017-04-23</date>
+  <keywords>FAIR, open, Force11</keywords>
+  <authors>
+    <group>
+      <name>Force 11: Scholarly Commons Subworking Group 3</name>
+    </group>
+  </authors>
+  <model answers-order="yes-first">
+    <space root="DataTags">definitions_FAIR_MM.ts</space>
+    <graph>questionnaire_FAIR_MM.dg</graph>
+  </model>
+  <references>
+  </references>
+</policy-model>
diff --git a/make-data-open/definitions-ps.pdf b/make-data-open/definitions-ps.pdf
new file mode 100644
index 0000000..af1c627
Binary files /dev/null and b/make-data-open/definitions-ps.pdf differ
diff --git a/make-data-open/languages/en-US/format.md b/make-data-open/languages/en-US/format.md
deleted file mode 100644
index d9144c6..0000000
--- a/make-data-open/languages/en-US/format.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Are the data in a proprietary (closed) format?
-
-## Terms
-* *proprietary format*: A file format whose specification is not open to the public, and thus cannot be reliably read without the usage of software whose code cannot be shared.
diff --git a/make-data-open/policy-model.xml b/make-data-open/policy-model.xml
index f714149..6ee6b11 100644
--- a/make-data-open/policy-model.xml
+++ b/make-data-open/policy-model.xml
@@ -2,6 +2,7 @@
   <title>Force11-Can I make my data open?</title>
   <version doi="xyz">0.4</version>
   <date>2017-04-23</date>
+  <keywords>repository, open, Force11</keywords><!-- suggested keywords list here. -->
   <!-- YYYY-MM-DD format -->
   <authors>
     <!-- Need to finalize the fields for author types and fields -->
@@ -15,10 +16,10 @@
       <contact>Someone@scwg-dt.org</contact>
     </group>
   </authors>
-  <model answers="yes-first">
+  <model answers-order="yes-first">
     <!-- other options: yes-last, verbatim. Default: yes-first -->
     <!-- pathes are relative to model directory -->
-    <space>definitions.ts</space>
+    <space root="DataTags">definitions.ts</space>
     <graph>questionnaire.dg</graph>
   </model>
   <references>
diff --git a/make-data-open/questionnaire-dg.pdf b/make-data-open/questionnaire-dg.pdf
new file mode 100644
index 0000000..cc824c9
Binary files /dev/null and b/make-data-open/questionnaire-dg.pdf differ
diff --git a/open-software/metadata.xml b/open-software/metadata.xml
deleted file mode 100644
index c699b66..0000000
--- a/open-software/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata version="1">
-    <title>Force11-Open Software</title>
-    <authors>
-        <author>
-            <name>Scholarly Commons Subworking Group 3</name>
-            <affiliation>Force 11</affiliation>
-        </author>
-    </authors>
-    <date>2017-04-23</date>
-    <version>0.2</version>
-</metadata>
diff --git a/open-software/policy-model.xml b/open-software/policy-model.xml
new file mode 100644
index 0000000..990a1d7
--- /dev/null
+++ b/open-software/policy-model.xml
@@ -0,0 +1,26 @@
+<policy-model>
+  <title>Force11-Open Software</title>
+  <version>0.2</version>
+  <date>2017-04-23</date>
+  <keywords>repository, open, Force11, software</keywords>
+  <authors>
+    <group>
+      <name>Force 11: Scholarly Commons Subworking Group 3</name>
+    </group>
+  </authors>
+  <model answers-order="yes-first">
+    <!-- other options: yes-last, verbatim. Default: yes-first -->
+    <!-- pathes are relative to model directory -->
+    <space root="DataTags">definitions.ts</space>
+    <graph>questionnaire.dg</graph>
+  </model>
+  <references>
+    <!-- Need to finalize the fields for references -->
+    <reference doi="1234567890">
+      ref1 text
+    </reference>
+    <reference url="http://somewhere.org/important/doc">
+      ref2 text
+    </reference>
+  </references>
+</policy-model>