diff --git a/.gitignore b/.gitignore
index c3477ecd..8d3c15c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ target/
 tmp/*
 Try*
 /examples/
-.DS_Store
\ No newline at end of file
+.DS_Store
+data/
diff --git a/docs/RabbitInAHat.html b/docs/RabbitInAHat.html
index f1a28bda..188affaa 100644
--- a/docs/RabbitInAHat.html
+++ b/docs/RabbitInAHat.html
@@ -13,21 +13,28 @@
 
 <title>Rabbit in a Hat</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
 <link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
 <script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -40,11 +47,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -57,32 +59,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -94,10 +71,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -113,40 +86,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -174,7 +120,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -186,7 +132,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -197,10 +143,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -212,7 +171,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -338,7 +296,7 @@
 
 
 <!-- setup 3col/9col grid for toc_float and main content  -->
-<div class="row-fluid">
+<div class="row">
 <div class="col-xs-12 col-sm-4 col-md-3">
 <div id="TOC" class="tocify">
 </div>
@@ -408,7 +366,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -560,7 +518,7 @@ <h3>Generating a SQL Skeleton (<em>v0.9.0</em>)</h3>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
@@ -570,6 +528,9 @@ <h3>Generating a SQL Skeleton (<em>v0.9.0</em>)</h3>
 <script>
 $(document).ready(function ()  {
 
+    // temporarily add toc-ignore selector to headers for the consistency with Pandoc
+    $('.unlisted.unnumbered').addClass('toc-ignore')
+
     // move toc-ignore selectors from section div to header
     $('div.section.toc-ignore')
         .removeClass('toc-ignore')
diff --git a/docs/ReadMe.html b/docs/ReadMe.html
index 51883c6b..679a6025 100644
--- a/docs/ReadMe.html
+++ b/docs/ReadMe.html
@@ -13,21 +13,28 @@
 
 <title>ReadMe</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
 <link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
 <script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -40,11 +47,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -57,32 +59,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -94,10 +71,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -113,40 +86,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -174,7 +120,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -186,7 +132,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -197,10 +143,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -212,7 +171,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -338,7 +296,7 @@
 
 
 <!-- setup 3col/9col grid for toc_float and main content  -->
-<div class="row-fluid">
+<div class="row">
 <div class="col-xs-12 col-sm-4 col-md-3">
 <div id="TOC" class="tocify">
 </div>
@@ -408,7 +366,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -461,7 +419,7 @@ <h2>Render html</h2>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
@@ -471,6 +429,9 @@ <h2>Render html</h2>
 <script>
 $(document).ready(function ()  {
 
+    // temporarily add toc-ignore selector to headers for the consistency with Pandoc
+    $('.unlisted.unnumbered').addClass('toc-ignore')
+
     // move toc-ignore selectors from section div to header
     $('div.section.toc-ignore')
         .removeClass('toc-ignore')
diff --git a/docs/ReadMe.md b/docs/ReadMe.md
index 04496170..e8755686 100644
--- a/docs/ReadMe.md
+++ b/docs/ReadMe.md
@@ -1,23 +1,23 @@
----
-pagetitle: "ReadMe"
----
-# White Rabbit Documentation Readme
-This folder contains the raw and rendered documentation of WhiteRabbit.
-
-## Contribute
-Contributions to the documentation are very welcome and even a must when new features are implemented.
-To update the documentation, edit one of the following markdown files or create a new markdown file:
- - [WhiteRabbit.md](/docs/WhiteRabbit.md)
- - [RabbitInAHat.md](/docs/RabbitInAHat.md)
- - [riah_test_framework.md](/docs/riah_test_framework.md)
- - [best_practices.md](/docs/best_practices.md) 
-
-## Render html
-To generate the site from markdown files, run the following R script with the `./docs` folder as working directory.
-Run this in a standalone R session, this is orders of magnitude faster compared to running in RStudio.
-
-```R
-#devtools::install_github("ropenscilabs/icon")
-library(rmarkdown)
-rmarkdown::render_site()
-```
\ No newline at end of file
+---
+pagetitle: "ReadMe"
+---
+# White Rabbit Documentation Readme
+This folder contains the raw and rendered documentation of WhiteRabbit.
+
+## Contribute
+Contributions to the documentation are very welcome and even a must when new features are implemented.
+To update the documentation, edit one of the following markdown files or create a new markdown file:
+ - [WhiteRabbit.md](/docs/WhiteRabbit.md)
+ - [RabbitInAHat.md](/docs/RabbitInAHat.md)
+ - [riah_test_framework.md](/docs/riah_test_framework.md)
+ - [best_practices.md](/docs/best_practices.md) 
+
+## Render html
+To generate the site from markdown files, run the following R script with the `./docs` folder as working directory.
+Run this in a standalone R session, this is orders of magnitude faster compared to running in RStudio.
+
+```R
+#devtools::install_github("ropenscilabs/icon")
+library(rmarkdown)
+rmarkdown::render_site()
+```
diff --git a/docs/WhiteRabbit.html b/docs/WhiteRabbit.html
index e4a97fc2..69bdd9f6 100644
--- a/docs/WhiteRabbit.html
+++ b/docs/WhiteRabbit.html
@@ -13,21 +13,28 @@
 
 <title>White Rabbit</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
 <link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
 <script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -40,11 +47,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -57,32 +59,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -94,10 +71,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -113,40 +86,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -174,7 +120,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -186,7 +132,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -197,10 +143,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -212,7 +171,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -338,7 +296,7 @@
 
 
 <!-- setup 3col/9col grid for toc_float and main content  -->
-<div class="row-fluid">
+<div class="row">
 <div class="col-xs-12 col-sm-4 col-md-3">
 <div id="TOC" class="tocify">
 </div>
@@ -408,7 +366,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -448,7 +406,7 @@ <h2>Installation</h2>
 See <a href="#running-from-the-command-line">Running from the command line</a> for details on how to run from the command line instead.</li>
 <li>Go to <a href="#using-the-application-functions">Using the Application Functions</a> for detailed instructions on how to make a scan of your data.</li>
 </ol>
-<p>Note: on releases earlier than version 0.8.0, open the respective WhiteRabbit.jar or RabbitInAHat.jar files instead.</p>
+<p>Note: on releases earlier than version 0.8.0, open the respective WhiteRabbit.jar or RabbitInAHat.jar files instead. Note: WhiteRabbit and RabbitInaHat only work from a path with only ascii characters.</p>
 <div id="memory" class="section level3">
 <h3>Memory</h3>
 <p>WhiteRabbit possibly does not start when the memory allocated by the JVM is too big or too small. By default this is set to 1200m. To increase the memory (in this example to 2400m), either set the environment variable <code>EXTRA_JVM_ARGUMENTS=-Xmx2400m</code> before starting or edit in <code>bin/WhiteRabbit.bat</code> the line <code>%JAVACMD% %JAVA_OPTS% -Xmx2400m...</code>. To lower the memory, set one of these variables to e.g. <code>-Xmx600m</code>. If you have a 32-bit Java VM installed and problems persist, consider installing 64-bit Java.</p>
@@ -691,7 +649,7 @@ <h2>Generating Fake Data</h2>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
@@ -701,6 +659,9 @@ <h2>Generating Fake Data</h2>
 <script>
 $(document).ready(function ()  {
 
+    // temporarily add toc-ignore selector to headers for the consistency with Pandoc
+    $('.unlisted.unnumbered').addClass('toc-ignore')
+
     // move toc-ignore selectors from section div to header
     $('div.section.toc-ignore')
         .removeClass('toc-ignore')
diff --git a/docs/best_practices.html b/docs/best_practices.html
index 77801766..1b454a44 100644
--- a/docs/best_practices.html
+++ b/docs/best_practices.html
@@ -13,18 +13,25 @@
 
 <title>Best Practices</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -37,11 +44,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -54,32 +56,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -91,10 +68,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -110,40 +83,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -171,7 +117,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -183,7 +129,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -194,10 +140,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -209,7 +168,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -332,7 +290,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -392,7 +350,7 @@ <h1 class="title toc-ignore">Best Practices</h1>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
diff --git a/docs/index.html b/docs/index.html
index 973367b8..fab63d70 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -13,18 +13,25 @@
 
 <title>Introduction</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -37,11 +44,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -54,32 +56,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -91,10 +68,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -110,40 +83,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -171,7 +117,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -183,7 +129,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -194,10 +140,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -209,7 +168,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -332,7 +290,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -369,7 +327,7 @@ <h1>Features</h1>
 </div>
 <div id="current-version" class="section level1">
 <h1>Current version</h1>
-<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.1</strong></a></p>
+<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.4</strong></a></p>
 </div>
 
 
@@ -399,7 +357,7 @@ <h1>Current version</h1>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
diff --git a/docs/index.md b/docs/index.md
index 8c21e091..614eade8 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,24 +1,24 @@
----
-title: Introduction
-output:
-  html_document:
-    toc: false
----
-
-|[]()||
-|---|---|
-| ![WR logo](https://github.com/OHDSI/WhiteRabbit/raw/master/whiterabbit/src/main/resources/org/ohdsi/whiteRabbit/WhiteRabbit64.png) | ![RiaH logo](https://github.com/OHDSI/WhiteRabbit/raw/master/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/RabbitInAHat64.png) |
-
-**WhiteRabbit** is a small application that can be used to analyse the structure and contents of a database as preparation for designing an ETL.
-It comes with **RabbitInAHat**, an application for interactive design of an ETL to the OMOP Common Data Model with the help of the the scan report generated by White Rabbit.
-
-# Features
-- Can scan databases in SQL Server, Oracle, PostgreSQL, MySQL, MS Access, Teradata, PDW, Amazon RedShift, Google BigQuery, SAS files and CSV files
-- The scan report contains information on tables, fields, and frequency distributions of values
-- Cutoff on the minimum frequency of values to protect patient privacy
-- WhiteRabbit can be run with a graphical user interface or from the command prompt
-- Interactive tool (Rabbit in a Hat) for designing the ETL using the scan report as basis
-- Rabbit in a Hat generates ETL specification document according to OMOP templatement according to OMOP template
-
-# Current version
-[**v0.10.1**](https://github.com/OHDSI/WhiteRabbit/releases/latest)
\ No newline at end of file
+---
+title: Introduction
+output:
+  html_document:
+    toc: false
+---
+
+|[]()||
+|---|---|
+| ![WR logo](https://github.com/OHDSI/WhiteRabbit/raw/master/whiterabbit/src/main/resources/org/ohdsi/whiteRabbit/WhiteRabbit64.png) | ![RiaH logo](https://github.com/OHDSI/WhiteRabbit/raw/master/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/RabbitInAHat64.png) |
+
+**WhiteRabbit** is a small application that can be used to analyse the structure and contents of a database as preparation for designing an ETL.
+It comes with **RabbitInAHat**, an application for interactive design of an ETL to the OMOP Common Data Model with the help of the the scan report generated by White Rabbit.
+
+# Features
+- Can scan databases in SQL Server, Oracle, PostgreSQL, MySQL, MS Access, Teradata, PDW, Amazon RedShift, Google BigQuery, SAS files and CSV files
+- The scan report contains information on tables, fields, and frequency distributions of values
+- Cutoff on the minimum frequency of values to protect patient privacy
+- WhiteRabbit can be run with a graphical user interface or from the command prompt
+- Interactive tool (Rabbit in a Hat) for designing the ETL using the scan report as basis
+- Rabbit in a Hat generates ETL specification document according to OMOP templatement according to OMOP template
+
+# Current version
+[**v0.10.4**](https://github.com/OHDSI/WhiteRabbit/releases/latest)
diff --git a/docs/riah_test_framework.html b/docs/riah_test_framework.html
index bfb81fa0..407e9145 100644
--- a/docs/riah_test_framework.html
+++ b/docs/riah_test_framework.html
@@ -13,21 +13,28 @@
 
 <title>Rabbit in a Hat testing framework</title>
 
-<script src="site_libs/header-attrs-2.5/header-attrs.js"></script>
-<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
+<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
+<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
 <script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
 <script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
+<style>h1 {font-size: 34px;}
+       h1.title {font-size: 38px;}
+       h2 {font-size: 30px;}
+       h3 {font-size: 24px;}
+       h4 {font-size: 18px;}
+       h5 {font-size: 16px;}
+       h6 {font-size: 12px;}
+       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
+       pre:not([class]) { background-color: white }</style>
 <script src="site_libs/jqueryui-1.11.4/jquery-ui.min.js"></script>
 <link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
 <script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
 <script src="site_libs/navigation-1.1/tabsets.js"></script>
 <link href="site_libs/highlightjs-9.12.0/default.css" rel="stylesheet" />
 <script src="site_libs/highlightjs-9.12.0/highlight.js"></script>
-<link href="site_libs/anchor-sections-1.0/anchor-sections.css" rel="stylesheet" />
-<script src="site_libs/anchor-sections-1.0/anchor-sections.js"></script>
 <link rel='shortcut icon' type='image/x-icon' href='images/favicon.ico' />
 
 <style type="text/css">
@@ -40,11 +47,6 @@
     </style>
 
 <style type="text/css">code{white-space: pre;}</style>
-<style type="text/css">
-  pre:not([class]) {
-    background-color: white;
-  }
-</style>
 <script type="text/javascript">
 if (window.hljs) {
   hljs.configure({languages: []});
@@ -57,32 +59,7 @@
 
 
 
-<style type="text/css">
-h1 {
-  font-size: 34px;
-}
-h1.title {
-  font-size: 38px;
-}
-h2 {
-  font-size: 30px;
-}
-h3 {
-  font-size: 24px;
-}
-h4 {
-  font-size: 18px;
-}
-h5 {
-  font-size: 16px;
-}
-h6 {
-  font-size: 12px;
-}
-.table th:not([align]) {
-  text-align: left;
-}
-</style>
+
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
@@ -94,10 +71,6 @@
   margin-left: auto;
   margin-right: auto;
 }
-code {
-  color: inherit;
-  background-color: rgba(0, 0, 0, 0.04);
-}
 img {
   max-width:100%;
 }
@@ -113,40 +86,13 @@
 summary {
   display: list-item;
 }
+pre code {
+  padding: 0;
+}
 </style>
 
 
 <style type="text/css">
-/* padding for bootstrap navbar */
-body {
-  padding-top: 51px;
-  padding-bottom: 40px;
-}
-/* offset scroll position for anchor links (for fixed navbar)  */
-.section h1 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h2 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h3 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h4 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h5 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
-.section h6 {
-  padding-top: 56px;
-  margin-top: -56px;
-}
 .dropdown-submenu {
   position: relative;
 }
@@ -174,7 +120,7 @@
   margin-right: -10px;
 }
 .dropdown-submenu:hover>a:after {
-  border-left-color: #ffffff;
+  border-left-color: #adb5bd;
 }
 .dropdown-submenu.pull-left {
   float: none;
@@ -186,7 +132,7 @@
 }
 </style>
 
-<script>
+<script type="text/javascript">
 // manage active state of menu based on current page
 $(document).ready(function () {
   // active menu anchor
@@ -197,10 +143,23 @@
   var menuAnchor = $('a[href="' + href + '"]');
 
   // mark it active
-  menuAnchor.parent().addClass('active');
+  menuAnchor.tab('show');
 
   // if it's got a parent navbar menu mark it active as well
   menuAnchor.closest('li.dropdown').addClass('active');
+
+  // Navbar adjustments
+  var navHeight = $(".navbar").first().height() + 15;
+  var style = document.createElement('style');
+  var pt = "padding-top: " + navHeight + "px; ";
+  var mt = "margin-top: -" + navHeight + "px; ";
+  var css = "";
+  // offset scroll position for anchor links (for fixed navbar)
+  for (var i = 1; i <= 6; i++) {
+    css += ".section h" + i + "{ " + pt + mt + "}\n";
+  }
+  style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
+  document.head.appendChild(style);
 });
 </script>
 
@@ -212,7 +171,6 @@
   max-height: 500px;
   min-height: 44px;
   overflow-y: auto;
-  background: white;
   border: 1px solid #ddd;
   border-radius: 4px;
 }
@@ -338,7 +296,7 @@
 
 
 <!-- setup 3col/9col grid for toc_float and main content  -->
-<div class="row-fluid">
+<div class="row">
 <div class="col-xs-12 col-sm-4 col-md-3">
 <div id="TOC" class="tocify">
 </div>
@@ -408,7 +366,7 @@
   </div><!--/.container -->
 </div><!--/.navbar -->
 
-<div class="fluid-row" id="header">
+<div id="header">
 
 
 
@@ -653,7 +611,7 @@ <h2>Export tests (<em>v0.9.0</em>)</h2>
 
 $(document).ready(function () {
   $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
+    $(this).parent().toggleClass('nav-tabs-open');
   });
 });
 </script>
@@ -663,6 +621,9 @@ <h2>Export tests (<em>v0.9.0</em>)</h2>
 <script>
 $(document).ready(function ()  {
 
+    // temporarily add toc-ignore selector to headers for the consistency with Pandoc
+    $('.unlisted.unnumbered').addClass('toc-ignore')
+
     // move toc-ignore selectors from section div to header
     $('div.section.toc-ignore')
         .removeClass('toc-ignore')
diff --git a/docs/site_libs/navigation-1.1/codefolding.js b/docs/site_libs/navigation-1.1/codefolding.js
index 1e16fde9..8a0d36f3 100644
--- a/docs/site_libs/navigation-1.1/codefolding.js
+++ b/docs/site_libs/navigation-1.1/codefolding.js
@@ -23,7 +23,6 @@ window.initializeCodeFolding = function(show) {
     // create a collapsable div to wrap the code in
     var div = $('<div class="collapse r-code-collapse"></div>');
     var showThis = (show || $(this).hasClass('fold-show')) && !$(this).hasClass('fold-hide');
-    if (showThis) div.addClass('in');
     var id = 'rcode-643E0F36' + currentIndex++;
     div.attr('id', id);
     $(this).before(div);
@@ -31,7 +30,7 @@ window.initializeCodeFolding = function(show) {
 
     // add a show code button right above
     var showCodeText = $('<span>' + (showThis ? 'Hide' : 'Code') + '</span>');
-    var showCodeButton = $('<button type="button" class="btn btn-default btn-xs code-folding-btn pull-right"></button>');
+    var showCodeButton = $('<button type="button" class="btn btn-default btn-xs btn-secondary btn-sm code-folding-btn pull-right float-right"></button>');
     showCodeButton.append(showCodeText);
     showCodeButton
         .attr('data-toggle', 'collapse')
@@ -47,13 +46,27 @@ window.initializeCodeFolding = function(show) {
 
     div.before(buttonRow);
 
+    // show the div if necessary
+    if (showThis) div.collapse('show');
+
     // update state of button on show/hide
-    div.on('hidden.bs.collapse', function () {
+    //   * Change text
+    //   * add a class for intermediate states styling
+    div.on('hide.bs.collapse', function () {
       showCodeText.text('Code');
+      showCodeButton.addClass('btn-collapsing');
+    });
+    div.on('hidden.bs.collapse', function () {
+      showCodeButton.removeClass('btn-collapsing');
     });
     div.on('show.bs.collapse', function () {
       showCodeText.text('Hide');
+      showCodeButton.addClass('btn-expanding');
+    });
+    div.on('shown.bs.collapse', function () {
+      showCodeButton.removeClass('btn-expanding');
     });
+
   });
 
 }
diff --git a/docs/site_libs/tocify-1.9.1/jquery.tocify.js b/docs/site_libs/tocify-1.9.1/jquery.tocify.js
index ba24a7dd..ca47b5fa 100644
--- a/docs/site_libs/tocify-1.9.1/jquery.tocify.js
+++ b/docs/site_libs/tocify-1.9.1/jquery.tocify.js
@@ -176,7 +176,7 @@
         self._setEventHandlers();
 
         // Binding to the Window load event to make sure the correct scrollTop is calculated
-        $(window).load(function() {
+        $(window).on("load", function() {
 
           // Sets the active TOC item
           self._setActiveElement(true);
diff --git a/pom.xml b/pom.xml
index 218c210f..c38cee39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.ohdsi</groupId>
     <artifactId>leporidae</artifactId>
     <packaging>pom</packaging>
-    <version>0.10.3</version>
+    <version>0.10.4</version>
     <modules>
         <module>rabbitinahat</module>
         <module>whiterabbit</module>
diff --git a/rabbit-core/pom.xml b/rabbit-core/pom.xml
index 5f8ea23a..1e5f309f 100644
--- a/rabbit-core/pom.xml
+++ b/rabbit-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.3</version>
+        <version>0.10.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,32 +30,32 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.16</version>
+            <version>8.0.23</version>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
+            <version>2.1.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-excelant</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.9</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>stax</groupId>
@@ -65,27 +65,27 @@
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
-            <version>2.3.0</version>
+            <version>5.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
+            <version>42.2.19</version>
         </dependency>
         <dependency>
             <groupId>com.cedarsoftware</groupId>
             <artifactId>json-io</artifactId>
-            <version>3.0.1</version>
+            <version>4.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.1</version>
+            <version>1.9.0</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.0</version>
+            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -95,22 +95,22 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.2.6</version>
+            <version>2.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.healthmarketscience.jackcess</groupId>
             <artifactId>jackcess</artifactId>
-            <version>2.1.3</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>net.sf.ucanaccess</groupId>
             <artifactId>ucanaccess</artifactId>
-            <version>3.0.3.1</version>
+            <version>5.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.amazon.redshift</groupId>
-            <artifactId>redshift-jdbc41</artifactId>
-            <version>1.1.10.1010</version>
+            <artifactId>redshift-jdbc42</artifactId>
+            <version>2.1.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.teradata.jdbc</groupId>
@@ -205,7 +205,7 @@
         <dependency>
             <groupId>com.epam</groupId>
             <artifactId>parso</artifactId>
-            <version>2.0</version>
+            <version>2.0.14</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/rabbit-core/src/main/java/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java b/rabbit-core/src/main/java/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java
index 2cb7018f..867f5267 100644
--- a/rabbit-core/src/main/java/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java
+++ b/rabbit-core/src/main/java/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java
@@ -1,14 +1,14 @@
 /*******************************************************************************
  * Copyright 2019 Observational Health Data Sciences and Informatics
- * 
+ *
  * This file is part of WhiteRabbit
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,13 +29,14 @@
 import java.util.Map;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.ohdsi.utilities.files.Row;
 
 public class ReadXlsxFileWithHeader implements Iterable<Row> {
 	private InputStream	inputstream;
-	
+
 	public ReadXlsxFileWithHeader(String filename) {
 		try {
 			inputstream = new FileInputStream(filename);
@@ -43,22 +44,22 @@ public ReadXlsxFileWithHeader(String filename) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public ReadXlsxFileWithHeader(InputStream inputstream) {
 		this.inputstream = inputstream;
 	}
-	
+
 	@Override
 	public Iterator<Row> iterator() {
 		return new RowIterator();
 	}
-	
+
 	public class RowIterator implements Iterator<Row> {
-		
+
 		private Iterator<org.apache.poi.ss.usermodel.Row>	iterator;
 		private Map<String, Integer>						fieldName2ColumnIndex;
 		private DecimalFormat								myFormatter	= new DecimalFormat("###############.################");
-		
+
 		public RowIterator() {
 			try {
 				XSSFWorkbook workbook = new XSSFWorkbook(inputstream);
@@ -71,18 +72,18 @@ public RowIterator() {
 				e.printStackTrace();
 			}
 		}
-		
+
 		@Override
 		public boolean hasNext() {
 			return iterator.hasNext();
 		}
-		
+
 		@Override
 		public Row next() {
 			List<String> cells = new ArrayList<String>(fieldName2ColumnIndex.size());
 			for (Cell cell : iterator.next()) {
 				String text;
-				if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
+				if (cell.getCellType() == CellType.NUMERIC)
 					text = myFormatter.format(cell.getNumericCellValue());
 				else
 					text = cell.toString();
@@ -92,11 +93,11 @@ public Row next() {
 				cells.add("");
 			return new Row(cells, fieldName2ColumnIndex);
 		}
-		
+
 		@Override
 		public void remove() {
 			throw new RuntimeException("Remove not supported");
 		}
-		
+
 	}
 }
diff --git a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ConceptsMap.java b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ConceptsMap.java
index 2ec8b407..e0a78c5d 100644
--- a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ConceptsMap.java
+++ b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ConceptsMap.java
@@ -44,7 +44,8 @@ private void load(String filename) throws IOException{
         try (InputStream conceptStream = Database.class.getResourceAsStream(filename)) {
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(conceptStream));
             vocabularyVersion = bufferedReader.readLine();
-            for (CSVRecord conceptRow : CSVFormat.RFC4180.withHeader().parse(bufferedReader)) {
+            CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.RFC4180).setHeader().build();
+            for (CSVRecord conceptRow : csvFormat.parse(bufferedReader)) {
                 String omopTableName = conceptRow.get("omop_cdm_table");
                 String omopFieldName = conceptRow.get("omop_cdm_field");
 
diff --git a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java
index 526c7263..be027540 100644
--- a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java
+++ b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java
@@ -34,15 +34,12 @@ public class Database implements Serializable {
 
 	public enum CDMVersion {
 		  CDMV4("CDMV4.csv")
-		, CDMV5("CDMV5.csv")
-		, CDMV501("CDMV5.0.1.csv")
-		, CDMV510("CDMV5.1.0.csv")
-		, CDMV520("CDMV5.2.0.csv")
-		, CDMV530("CDMV5.3.0.csv")
-		, CDMV531("CDMV5.3.1.csv")
-		, CDMV531_O("CDMV5.3.1_Oncology.csv")
+		, CDMV50("CDMV5.0.csv")
+		, CDMV51("CDMV5.1.csv")
+		, CDMV52("CDMV5.2.csv")
+		, CDMV53("CDMV5.3.csv")
+		, CDMV54("CDMV5.4.csv")
 		, CDMV60("CDMV6.0.csv")
-		, CDMV60_O("CDMV6.0_Oncology.csv")
 		;
 
 		private final String fileName;
@@ -95,7 +92,8 @@ public static Database generateModelFromCSV(InputStream stream, String dbName) {
 			ConceptsMap conceptIdHintsMap = new ConceptsMap(CONCEPT_ID_HINTS_FILE_NAME);
 			database.conceptIdHintsVocabularyVersion = conceptIdHintsMap.vocabularyVersion;
 
-			for (CSVRecord row : CSVFormat.RFC4180.withHeader().parse(new InputStreamReader(stream))) {
+			CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.RFC4180).setHeader().build();
+			for (CSVRecord row : csvFormat.parse(new InputStreamReader(stream))) {
 				String tableNameColumn;
 				String fieldNameColumn;
 				String isNullableColumn;
diff --git a/rabbit-core/src/main/java/org/ohdsi/utilities/files/QuickAndDirtyXlsxReader.java b/rabbit-core/src/main/java/org/ohdsi/utilities/files/QuickAndDirtyXlsxReader.java
index 9f2add31..f62f74eb 100644
--- a/rabbit-core/src/main/java/org/ohdsi/utilities/files/QuickAndDirtyXlsxReader.java
+++ b/rabbit-core/src/main/java/org/ohdsi/utilities/files/QuickAndDirtyXlsxReader.java
@@ -23,8 +23,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,11 +41,11 @@ public class QuickAndDirtyXlsxReader extends ArrayList<Sheet> {
 	private static final long serialVersionUID = 25124428448185386L;
 	private static final Pattern DOUBLE_IGNORE_PATTERN = Pattern.compile("[<>= ]+");
 
-	private List<String> sharedStrings = new ArrayList<>();
+	private final List<String> sharedStrings = new ArrayList<>();
 
-	private Map<String, Sheet> rIdToSheet = new HashMap<>();
-	private Map<String, Sheet> nameToSheet = new HashMap<>();
-	private Map<String, Sheet> filenameToSheet = new HashMap<>();
+	private final Map<String, Sheet> rIdToSheet = new HashMap<>();
+	private final Map<String, Sheet> nameToSheet = new HashMap<>();
+	private final Map<String, Sheet> filenameToSheet = new HashMap<>();
 
 	public QuickAndDirtyXlsxReader(String filename) {
 		try {
@@ -58,7 +58,7 @@ public QuickAndDirtyXlsxReader(String filename) {
 			readFromStream(inputStream);
 
 			// Step 3: order the sheets:
-			Collections.sort(this, (o1, o2) -> IntegerComparator.compare(o1.order, o2.order));
+			this.sort((o1, o2) -> IntegerComparator.compare(o1.order, o2.order));
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		}
@@ -69,7 +69,7 @@ private void loadSharedStringsAndRels(FileInputStream inputStream) {
 			int tasksComplete = 0;
 			ZipInputStream zipInputStream = new ZipInputStream(inputStream);
 
-			ZipEntry zipEntry = null;
+			ZipEntry zipEntry;
 			while ((zipEntry = zipInputStream.getNextEntry()) != null) {
 				String filename = zipEntry.getName();
 				if (filename.equals("xl/sharedStrings.xml")) {
@@ -91,8 +91,8 @@ private void loadSharedStringsAndRels(FileInputStream inputStream) {
 	}
 
 	private void processRels(ZipInputStream inputStream) throws IOException {
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
-		String line = null;
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+		String line;
 		while ((line = bufferedReader.readLine()) != null)
 			for (String tag : StringUtilities.multiFindBetween(line, "<Relationship", ">")) {
 				String rId = StringUtilities.findBetween(tag, "Id=\"", "\"");
@@ -106,15 +106,11 @@ private void processRels(ZipInputStream inputStream) throws IOException {
 			}
 	}
 
-	public QuickAndDirtyXlsxReader(InputStream stream) {
-		readFromStream(stream);
-	}
-
 	private void readFromStream(InputStream inputStream) {
 		try {
 			ZipInputStream zipInputStream = new ZipInputStream(inputStream);
 
-			ZipEntry zipEntry = null;
+			ZipEntry zipEntry;
 			while ((zipEntry = zipInputStream.getNextEntry()) != null) {
 				String filename = zipEntry.getName();
 				if (filename.equals("xl/workbook.xml"))
@@ -129,7 +125,7 @@ else if (filename.startsWith("xl/worksheets/sheet"))
 	}
 
 	private void processSharedStrings(ZipInputStream inputStream) throws IOException {
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
 		StringBuilder fullFile = new StringBuilder();
 		String line;
 		while ((line = bufferedReader.readLine()) != null)
@@ -147,7 +143,7 @@ private void processSharedStrings(ZipInputStream inputStream) throws IOException
 	private void processSheet(String filename, ZipInputStream inputStream) throws IOException {
 		Sheet sheet = filenameToSheet.get(filename);
 		//System.out.println(filename + "\t" + sheet.name);
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
 		String line;
 		StringBuilder fullSheet = new StringBuilder();
 		while ((line = bufferedReader.readLine()) != null)
@@ -163,7 +159,7 @@ private void processSheet(String filename, ZipInputStream inputStream) throws IO
 	}
 
 	public List<String> findCellValues(String string) {
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 		int tagStart = -1;
 		int stringStart = -1;
 		int column = -1;
@@ -215,264 +211,264 @@ private int parseColumn(String cellIdString) {
 		return -1;
 	}
 
-	private static HashMap<String, Integer>	htmlEntities	= new HashMap<String, Integer>();
+	private static final HashMap<String, Integer> htmlEntities = new HashMap<>();
 	static {
-		htmlEntities.put("nbsp", new Integer(160));
-		htmlEntities.put("iexcl", new Integer(161));
-		htmlEntities.put("cent", new Integer(162));
-		htmlEntities.put("pound", new Integer(163));
-		htmlEntities.put("curren", new Integer(164));
-		htmlEntities.put("yen", new Integer(165));
-		htmlEntities.put("brvbar", new Integer(166));
-		htmlEntities.put("sect", new Integer(167));
-		htmlEntities.put("uml", new Integer(168));
-		htmlEntities.put("copy", new Integer(169));
-		htmlEntities.put("ordf", new Integer(170));
-		htmlEntities.put("laquo", new Integer(171));
-		htmlEntities.put("not", new Integer(172));
-		htmlEntities.put("shy", new Integer(173));
-		htmlEntities.put("reg", new Integer(174));
-		htmlEntities.put("macr", new Integer(175));
-		htmlEntities.put("deg", new Integer(176));
-		htmlEntities.put("plusmn", new Integer(177));
-		htmlEntities.put("sup2", new Integer(178));
-		htmlEntities.put("sup3", new Integer(179));
-		htmlEntities.put("acute", new Integer(180));
-		htmlEntities.put("micro", new Integer(181));
-		htmlEntities.put("para", new Integer(182));
-		htmlEntities.put("middot", new Integer(183));
-		htmlEntities.put("cedil", new Integer(184));
-		htmlEntities.put("sup1", new Integer(185));
-		htmlEntities.put("ordm", new Integer(186));
-		htmlEntities.put("raquo", new Integer(187));
-		htmlEntities.put("frac14", new Integer(188));
-		htmlEntities.put("frac12", new Integer(189));
-		htmlEntities.put("frac34", new Integer(190));
-		htmlEntities.put("iquest", new Integer(191));
-		htmlEntities.put("Agrave", new Integer(192));
-		htmlEntities.put("Aacute", new Integer(193));
-		htmlEntities.put("Acirc", new Integer(194));
-		htmlEntities.put("Atilde", new Integer(195));
-		htmlEntities.put("Auml", new Integer(196));
-		htmlEntities.put("Aring", new Integer(197));
-		htmlEntities.put("AElig", new Integer(198));
-		htmlEntities.put("Ccedil", new Integer(199));
-		htmlEntities.put("Egrave", new Integer(200));
-		htmlEntities.put("Eacute", new Integer(201));
-		htmlEntities.put("Ecirc", new Integer(202));
-		htmlEntities.put("Euml", new Integer(203));
-		htmlEntities.put("Igrave", new Integer(204));
-		htmlEntities.put("Iacute", new Integer(205));
-		htmlEntities.put("Icirc", new Integer(206));
-		htmlEntities.put("Iuml", new Integer(207));
-		htmlEntities.put("ETH", new Integer(208));
-		htmlEntities.put("Ntilde", new Integer(209));
-		htmlEntities.put("Ograve", new Integer(210));
-		htmlEntities.put("Oacute", new Integer(211));
-		htmlEntities.put("Ocirc", new Integer(212));
-		htmlEntities.put("Otilde", new Integer(213));
-		htmlEntities.put("Ouml", new Integer(214));
-		htmlEntities.put("times", new Integer(215));
-		htmlEntities.put("Oslash", new Integer(216));
-		htmlEntities.put("Ugrave", new Integer(217));
-		htmlEntities.put("Uacute", new Integer(218));
-		htmlEntities.put("Ucirc", new Integer(219));
-		htmlEntities.put("Uuml", new Integer(220));
-		htmlEntities.put("Yacute", new Integer(221));
-		htmlEntities.put("THORN", new Integer(222));
-		htmlEntities.put("szlig", new Integer(223));
-		htmlEntities.put("agrave", new Integer(224));
-		htmlEntities.put("aacute", new Integer(225));
-		htmlEntities.put("acirc", new Integer(226));
-		htmlEntities.put("atilde", new Integer(227));
-		htmlEntities.put("auml", new Integer(228));
-		htmlEntities.put("aring", new Integer(229));
-		htmlEntities.put("aelig", new Integer(230));
-		htmlEntities.put("ccedil", new Integer(231));
-		htmlEntities.put("egrave", new Integer(232));
-		htmlEntities.put("eacute", new Integer(233));
-		htmlEntities.put("ecirc", new Integer(234));
-		htmlEntities.put("euml", new Integer(235));
-		htmlEntities.put("igrave", new Integer(236));
-		htmlEntities.put("iacute", new Integer(237));
-		htmlEntities.put("icirc", new Integer(238));
-		htmlEntities.put("iuml", new Integer(239));
-		htmlEntities.put("eth", new Integer(240));
-		htmlEntities.put("ntilde", new Integer(241));
-		htmlEntities.put("ograve", new Integer(242));
-		htmlEntities.put("oacute", new Integer(243));
-		htmlEntities.put("ocirc", new Integer(244));
-		htmlEntities.put("otilde", new Integer(245));
-		htmlEntities.put("ouml", new Integer(246));
-		htmlEntities.put("divide", new Integer(247));
-		htmlEntities.put("oslash", new Integer(248));
-		htmlEntities.put("ugrave", new Integer(249));
-		htmlEntities.put("uacute", new Integer(250));
-		htmlEntities.put("ucirc", new Integer(251));
-		htmlEntities.put("uuml", new Integer(252));
-		htmlEntities.put("yacute", new Integer(253));
-		htmlEntities.put("thorn", new Integer(254));
-		htmlEntities.put("yuml", new Integer(255));
-		htmlEntities.put("fnof", new Integer(402));
-		htmlEntities.put("Alpha", new Integer(913));
-		htmlEntities.put("Beta", new Integer(914));
-		htmlEntities.put("Gamma", new Integer(915));
-		htmlEntities.put("Delta", new Integer(916));
-		htmlEntities.put("Epsilon", new Integer(917));
-		htmlEntities.put("Zeta", new Integer(918));
-		htmlEntities.put("Eta", new Integer(919));
-		htmlEntities.put("Theta", new Integer(920));
-		htmlEntities.put("Iota", new Integer(921));
-		htmlEntities.put("Kappa", new Integer(922));
-		htmlEntities.put("Lambda", new Integer(923));
-		htmlEntities.put("Mu", new Integer(924));
-		htmlEntities.put("Nu", new Integer(925));
-		htmlEntities.put("Xi", new Integer(926));
-		htmlEntities.put("Omicron", new Integer(927));
-		htmlEntities.put("Pi", new Integer(928));
-		htmlEntities.put("Rho", new Integer(929));
-		htmlEntities.put("Sigma", new Integer(931));
-		htmlEntities.put("Tau", new Integer(932));
-		htmlEntities.put("Upsilon", new Integer(933));
-		htmlEntities.put("Phi", new Integer(934));
-		htmlEntities.put("Chi", new Integer(935));
-		htmlEntities.put("Psi", new Integer(936));
-		htmlEntities.put("Omega", new Integer(937));
-		htmlEntities.put("alpha", new Integer(945));
-		htmlEntities.put("beta", new Integer(946));
-		htmlEntities.put("gamma", new Integer(947));
-		htmlEntities.put("delta", new Integer(948));
-		htmlEntities.put("epsilon", new Integer(949));
-		htmlEntities.put("zeta", new Integer(950));
-		htmlEntities.put("eta", new Integer(951));
-		htmlEntities.put("theta", new Integer(952));
-		htmlEntities.put("iota", new Integer(953));
-		htmlEntities.put("kappa", new Integer(954));
-		htmlEntities.put("lambda", new Integer(955));
-		htmlEntities.put("mu", new Integer(956));
-		htmlEntities.put("nu", new Integer(957));
-		htmlEntities.put("xi", new Integer(958));
-		htmlEntities.put("omicron", new Integer(959));
-		htmlEntities.put("pi", new Integer(960));
-		htmlEntities.put("rho", new Integer(961));
-		htmlEntities.put("sigmaf", new Integer(962));
-		htmlEntities.put("sigma", new Integer(963));
-		htmlEntities.put("tau", new Integer(964));
-		htmlEntities.put("upsilon", new Integer(965));
-		htmlEntities.put("phi", new Integer(966));
-		htmlEntities.put("chi", new Integer(967));
-		htmlEntities.put("psi", new Integer(968));
-		htmlEntities.put("omega", new Integer(969));
-		htmlEntities.put("thetasym", new Integer(977));
-		htmlEntities.put("upsih", new Integer(978));
-		htmlEntities.put("piv", new Integer(982));
-		htmlEntities.put("bull", new Integer(8226));
-		htmlEntities.put("hellip", new Integer(8230));
-		htmlEntities.put("prime", new Integer(8242));
-		htmlEntities.put("Prime", new Integer(8243));
-		htmlEntities.put("oline", new Integer(8254));
-		htmlEntities.put("frasl", new Integer(8260));
-		htmlEntities.put("weierp", new Integer(8472));
-		htmlEntities.put("image", new Integer(8465));
-		htmlEntities.put("real", new Integer(8476));
-		htmlEntities.put("trade", new Integer(8482));
-		htmlEntities.put("alefsym", new Integer(8501));
-		htmlEntities.put("larr", new Integer(8592));
-		htmlEntities.put("uarr", new Integer(8593));
-		htmlEntities.put("rarr", new Integer(8594));
-		htmlEntities.put("darr", new Integer(8595));
-		htmlEntities.put("harr", new Integer(8596));
-		htmlEntities.put("crarr", new Integer(8629));
-		htmlEntities.put("lArr", new Integer(8656));
-		htmlEntities.put("uArr", new Integer(8657));
-		htmlEntities.put("rArr", new Integer(8658));
-		htmlEntities.put("dArr", new Integer(8659));
-		htmlEntities.put("hArr", new Integer(8660));
-		htmlEntities.put("forall", new Integer(8704));
-		htmlEntities.put("part", new Integer(8706));
-		htmlEntities.put("exist", new Integer(8707));
-		htmlEntities.put("empty", new Integer(8709));
-		htmlEntities.put("nabla", new Integer(8711));
-		htmlEntities.put("isin", new Integer(8712));
-		htmlEntities.put("notin", new Integer(8713));
-		htmlEntities.put("ni", new Integer(8715));
-		htmlEntities.put("prod", new Integer(8719));
-		htmlEntities.put("sum", new Integer(8721));
-		htmlEntities.put("minus", new Integer(8722));
-		htmlEntities.put("lowast", new Integer(8727));
-		htmlEntities.put("radic", new Integer(8730));
-		htmlEntities.put("prop", new Integer(8733));
-		htmlEntities.put("infin", new Integer(8734));
-		htmlEntities.put("ang", new Integer(8736));
-		htmlEntities.put("and", new Integer(8743));
-		htmlEntities.put("or", new Integer(8744));
-		htmlEntities.put("cap", new Integer(8745));
-		htmlEntities.put("cup", new Integer(8746));
-		htmlEntities.put("int", new Integer(8747));
-		htmlEntities.put("there4", new Integer(8756));
-		htmlEntities.put("sim", new Integer(8764));
-		htmlEntities.put("cong", new Integer(8773));
-		htmlEntities.put("asymp", new Integer(8776));
-		htmlEntities.put("ne", new Integer(8800));
-		htmlEntities.put("equiv", new Integer(8801));
-		htmlEntities.put("le", new Integer(8804));
-		htmlEntities.put("ge", new Integer(8805));
-		htmlEntities.put("sub", new Integer(8834));
-		htmlEntities.put("sup", new Integer(8835));
-		htmlEntities.put("nsub", new Integer(8836));
-		htmlEntities.put("sube", new Integer(8838));
-		htmlEntities.put("supe", new Integer(8839));
-		htmlEntities.put("oplus", new Integer(8853));
-		htmlEntities.put("otimes", new Integer(8855));
-		htmlEntities.put("perp", new Integer(8869));
-		htmlEntities.put("sdot", new Integer(8901));
-		htmlEntities.put("lceil", new Integer(8968));
-		htmlEntities.put("rceil", new Integer(8969));
-		htmlEntities.put("lfloor", new Integer(8970));
-		htmlEntities.put("rfloor", new Integer(8971));
-		htmlEntities.put("lang", new Integer(9001));
-		htmlEntities.put("rang", new Integer(9002));
-		htmlEntities.put("loz", new Integer(9674));
-		htmlEntities.put("spades", new Integer(9824));
-		htmlEntities.put("clubs", new Integer(9827));
-		htmlEntities.put("hearts", new Integer(9829));
-		htmlEntities.put("diams", new Integer(9830));
-		htmlEntities.put("quot", new Integer(34));
-		htmlEntities.put("amp", new Integer(38));
-		htmlEntities.put("lt", new Integer(60));
-		htmlEntities.put("gt", new Integer(62));
-		htmlEntities.put("OElig", new Integer(338));
-		htmlEntities.put("oelig", new Integer(339));
-		htmlEntities.put("Scaron", new Integer(352));
-		htmlEntities.put("scaron", new Integer(353));
-		htmlEntities.put("Yuml", new Integer(376));
-		htmlEntities.put("circ", new Integer(710));
-		htmlEntities.put("tilde", new Integer(732));
-		htmlEntities.put("ensp", new Integer(8194));
-		htmlEntities.put("emsp", new Integer(8195));
-		htmlEntities.put("thinsp", new Integer(8201));
-		htmlEntities.put("zwnj", new Integer(8204));
-		htmlEntities.put("zwj", new Integer(8205));
-		htmlEntities.put("lrm", new Integer(8206));
-		htmlEntities.put("rlm", new Integer(8207));
-		htmlEntities.put("ndash", new Integer(8211));
-		htmlEntities.put("mdash", new Integer(8212));
-		htmlEntities.put("lsquo", new Integer(8216));
-		htmlEntities.put("rsquo", new Integer(8217));
-		htmlEntities.put("sbquo", new Integer(8218));
-		htmlEntities.put("ldquo", new Integer(8220));
-		htmlEntities.put("rdquo", new Integer(8221));
-		htmlEntities.put("bdquo", new Integer(8222));
-		htmlEntities.put("dagger", new Integer(8224));
-		htmlEntities.put("Dagger", new Integer(8225));
-		htmlEntities.put("permil", new Integer(8240));
-		htmlEntities.put("lsaquo", new Integer(8249));
-		htmlEntities.put("rsaquo", new Integer(8250));
-		htmlEntities.put("euro", new Integer(8364));
+		htmlEntities.put("nbsp", 160);
+		htmlEntities.put("iexcl", 161);
+		htmlEntities.put("cent", 162);
+		htmlEntities.put("pound", 163);
+		htmlEntities.put("curren", 164);
+		htmlEntities.put("yen", 165);
+		htmlEntities.put("brvbar", 166);
+		htmlEntities.put("sect", 167);
+		htmlEntities.put("uml", 168);
+		htmlEntities.put("copy", 169);
+		htmlEntities.put("ordf", 170);
+		htmlEntities.put("laquo", 171);
+		htmlEntities.put("not", 172);
+		htmlEntities.put("shy", 173);
+		htmlEntities.put("reg", 174);
+		htmlEntities.put("macr", 175);
+		htmlEntities.put("deg", 176);
+		htmlEntities.put("plusmn", 177);
+		htmlEntities.put("sup2", 178);
+		htmlEntities.put("sup3", 179);
+		htmlEntities.put("acute", 180);
+		htmlEntities.put("micro", 181);
+		htmlEntities.put("para", 182);
+		htmlEntities.put("middot", 183);
+		htmlEntities.put("cedil", 184);
+		htmlEntities.put("sup1", 185);
+		htmlEntities.put("ordm", 186);
+		htmlEntities.put("raquo", 187);
+		htmlEntities.put("frac14", 188);
+		htmlEntities.put("frac12", 189);
+		htmlEntities.put("frac34", 190);
+		htmlEntities.put("iquest", 191);
+		htmlEntities.put("Agrave", 192);
+		htmlEntities.put("Aacute", 193);
+		htmlEntities.put("Acirc", 194);
+		htmlEntities.put("Atilde", 195);
+		htmlEntities.put("Auml", 196);
+		htmlEntities.put("Aring", 197);
+		htmlEntities.put("AElig", 198);
+		htmlEntities.put("Ccedil", 199);
+		htmlEntities.put("Egrave", 200);
+		htmlEntities.put("Eacute", 201);
+		htmlEntities.put("Ecirc", 202);
+		htmlEntities.put("Euml", 203);
+		htmlEntities.put("Igrave", 204);
+		htmlEntities.put("Iacute", 205);
+		htmlEntities.put("Icirc", 206);
+		htmlEntities.put("Iuml", 207);
+		htmlEntities.put("ETH", 208);
+		htmlEntities.put("Ntilde", 209);
+		htmlEntities.put("Ograve", 210);
+		htmlEntities.put("Oacute", 211);
+		htmlEntities.put("Ocirc", 212);
+		htmlEntities.put("Otilde", 213);
+		htmlEntities.put("Ouml", 214);
+		htmlEntities.put("times", 215);
+		htmlEntities.put("Oslash", 216);
+		htmlEntities.put("Ugrave", 217);
+		htmlEntities.put("Uacute", 218);
+		htmlEntities.put("Ucirc", 219);
+		htmlEntities.put("Uuml", 220);
+		htmlEntities.put("Yacute", 221);
+		htmlEntities.put("THORN", 222);
+		htmlEntities.put("szlig", 223);
+		htmlEntities.put("agrave", 224);
+		htmlEntities.put("aacute", 225);
+		htmlEntities.put("acirc", 226);
+		htmlEntities.put("atilde", 227);
+		htmlEntities.put("auml", 228);
+		htmlEntities.put("aring", 229);
+		htmlEntities.put("aelig", 230);
+		htmlEntities.put("ccedil", 231);
+		htmlEntities.put("egrave", 232);
+		htmlEntities.put("eacute", 233);
+		htmlEntities.put("ecirc", 234);
+		htmlEntities.put("euml", 235);
+		htmlEntities.put("igrave", 236);
+		htmlEntities.put("iacute", 237);
+		htmlEntities.put("icirc", 238);
+		htmlEntities.put("iuml", 239);
+		htmlEntities.put("eth", 240);
+		htmlEntities.put("ntilde", 241);
+		htmlEntities.put("ograve", 242);
+		htmlEntities.put("oacute", 243);
+		htmlEntities.put("ocirc", 244);
+		htmlEntities.put("otilde", 245);
+		htmlEntities.put("ouml", 246);
+		htmlEntities.put("divide", 247);
+		htmlEntities.put("oslash", 248);
+		htmlEntities.put("ugrave", 249);
+		htmlEntities.put("uacute", 250);
+		htmlEntities.put("ucirc", 251);
+		htmlEntities.put("uuml", 252);
+		htmlEntities.put("yacute", 253);
+		htmlEntities.put("thorn", 254);
+		htmlEntities.put("yuml", 255);
+		htmlEntities.put("fnof", 402);
+		htmlEntities.put("Alpha", 913);
+		htmlEntities.put("Beta", 914);
+		htmlEntities.put("Gamma", 915);
+		htmlEntities.put("Delta", 916);
+		htmlEntities.put("Epsilon", 917);
+		htmlEntities.put("Zeta", 918);
+		htmlEntities.put("Eta", 919);
+		htmlEntities.put("Theta", 920);
+		htmlEntities.put("Iota", 921);
+		htmlEntities.put("Kappa", 922);
+		htmlEntities.put("Lambda", 923);
+		htmlEntities.put("Mu", 924);
+		htmlEntities.put("Nu", 925);
+		htmlEntities.put("Xi", 926);
+		htmlEntities.put("Omicron", 927);
+		htmlEntities.put("Pi", 928);
+		htmlEntities.put("Rho", 929);
+		htmlEntities.put("Sigma", 931);
+		htmlEntities.put("Tau", 932);
+		htmlEntities.put("Upsilon", 933);
+		htmlEntities.put("Phi", 934);
+		htmlEntities.put("Chi", 935);
+		htmlEntities.put("Psi", 936);
+		htmlEntities.put("Omega", 937);
+		htmlEntities.put("alpha", 945);
+		htmlEntities.put("beta", 946);
+		htmlEntities.put("gamma", 947);
+		htmlEntities.put("delta", 948);
+		htmlEntities.put("epsilon", 949);
+		htmlEntities.put("zeta", 950);
+		htmlEntities.put("eta", 951);
+		htmlEntities.put("theta", 952);
+		htmlEntities.put("iota", 953);
+		htmlEntities.put("kappa", 954);
+		htmlEntities.put("lambda", 955);
+		htmlEntities.put("mu", 956);
+		htmlEntities.put("nu", 957);
+		htmlEntities.put("xi", 958);
+		htmlEntities.put("omicron", 959);
+		htmlEntities.put("pi", 960);
+		htmlEntities.put("rho", 961);
+		htmlEntities.put("sigmaf", 962);
+		htmlEntities.put("sigma", 963);
+		htmlEntities.put("tau", 964);
+		htmlEntities.put("upsilon", 965);
+		htmlEntities.put("phi", 966);
+		htmlEntities.put("chi", 967);
+		htmlEntities.put("psi", 968);
+		htmlEntities.put("omega", 969);
+		htmlEntities.put("thetasym", 977);
+		htmlEntities.put("upsih", 978);
+		htmlEntities.put("piv", 982);
+		htmlEntities.put("bull", 8226);
+		htmlEntities.put("hellip", 8230);
+		htmlEntities.put("prime", 8242);
+		htmlEntities.put("Prime", 8243);
+		htmlEntities.put("oline", 8254);
+		htmlEntities.put("frasl", 8260);
+		htmlEntities.put("weierp", 8472);
+		htmlEntities.put("image", 8465);
+		htmlEntities.put("real", 8476);
+		htmlEntities.put("trade", 8482);
+		htmlEntities.put("alefsym", 8501);
+		htmlEntities.put("larr", 8592);
+		htmlEntities.put("uarr", 8593);
+		htmlEntities.put("rarr", 8594);
+		htmlEntities.put("darr", 8595);
+		htmlEntities.put("harr", 8596);
+		htmlEntities.put("crarr", 8629);
+		htmlEntities.put("lArr", 8656);
+		htmlEntities.put("uArr", 8657);
+		htmlEntities.put("rArr", 8658);
+		htmlEntities.put("dArr", 8659);
+		htmlEntities.put("hArr", 8660);
+		htmlEntities.put("forall", 8704);
+		htmlEntities.put("part", 8706);
+		htmlEntities.put("exist", 8707);
+		htmlEntities.put("empty", 8709);
+		htmlEntities.put("nabla", 8711);
+		htmlEntities.put("isin", 8712);
+		htmlEntities.put("notin", 8713);
+		htmlEntities.put("ni", 8715);
+		htmlEntities.put("prod", 8719);
+		htmlEntities.put("sum", 8721);
+		htmlEntities.put("minus", 8722);
+		htmlEntities.put("lowast", 8727);
+		htmlEntities.put("radic", 8730);
+		htmlEntities.put("prop", 8733);
+		htmlEntities.put("infin", 8734);
+		htmlEntities.put("ang", 8736);
+		htmlEntities.put("and", 8743);
+		htmlEntities.put("or", 8744);
+		htmlEntities.put("cap", 8745);
+		htmlEntities.put("cup", 8746);
+		htmlEntities.put("int", 8747);
+		htmlEntities.put("there4", 8756);
+		htmlEntities.put("sim", 8764);
+		htmlEntities.put("cong", 8773);
+		htmlEntities.put("asymp", 8776);
+		htmlEntities.put("ne", 8800);
+		htmlEntities.put("equiv", 8801);
+		htmlEntities.put("le", 8804);
+		htmlEntities.put("ge", 8805);
+		htmlEntities.put("sub", 8834);
+		htmlEntities.put("sup", 8835);
+		htmlEntities.put("nsub", 8836);
+		htmlEntities.put("sube", 8838);
+		htmlEntities.put("supe", 8839);
+		htmlEntities.put("oplus", 8853);
+		htmlEntities.put("otimes", 8855);
+		htmlEntities.put("perp", 8869);
+		htmlEntities.put("sdot", 8901);
+		htmlEntities.put("lceil", 8968);
+		htmlEntities.put("rceil", 8969);
+		htmlEntities.put("lfloor", 8970);
+		htmlEntities.put("rfloor", 8971);
+		htmlEntities.put("lang", 9001);
+		htmlEntities.put("rang", 9002);
+		htmlEntities.put("loz", 9674);
+		htmlEntities.put("spades", 9824);
+		htmlEntities.put("clubs", 9827);
+		htmlEntities.put("hearts", 9829);
+		htmlEntities.put("diams", 9830);
+		htmlEntities.put("quot", 34);
+		htmlEntities.put("amp", 38);
+		htmlEntities.put("lt", 60);
+		htmlEntities.put("gt", 62);
+		htmlEntities.put("OElig", 338);
+		htmlEntities.put("oelig", 339);
+		htmlEntities.put("Scaron", 352);
+		htmlEntities.put("scaron", 353);
+		htmlEntities.put("Yuml", 376);
+		htmlEntities.put("circ", 710);
+		htmlEntities.put("tilde", 732);
+		htmlEntities.put("ensp", 8194);
+		htmlEntities.put("emsp", 8195);
+		htmlEntities.put("thinsp", 8201);
+		htmlEntities.put("zwnj", 8204);
+		htmlEntities.put("zwj", 8205);
+		htmlEntities.put("lrm", 8206);
+		htmlEntities.put("rlm", 8207);
+		htmlEntities.put("ndash", 8211);
+		htmlEntities.put("mdash", 8212);
+		htmlEntities.put("lsquo", 8216);
+		htmlEntities.put("rsquo", 8217);
+		htmlEntities.put("sbquo", 8218);
+		htmlEntities.put("ldquo", 8220);
+		htmlEntities.put("rdquo", 8221);
+		htmlEntities.put("bdquo", 8222);
+		htmlEntities.put("dagger", 8224);
+		htmlEntities.put("Dagger", 8225);
+		htmlEntities.put("permil", 8240);
+		htmlEntities.put("lsaquo", 8249);
+		htmlEntities.put("rsaquo", 8250);
+		htmlEntities.put("euro", 8364);
 	}
 
 	public static String decode(String s) {
-		StringBuffer result = new StringBuffer(s.length());
+		StringBuilder result = new StringBuilder(s.length());
 		int ampInd = s.indexOf("&");
 		int lastEnd = 0;
 		while (ampInd >= 0) {
@@ -486,12 +482,12 @@ public static String decode(String s) {
 						value = Integer.parseInt(escape.substring(1), 10);
 					} else {
 						if (htmlEntities.containsKey(escape)) {
-							value = ((Integer) (htmlEntities.get(escape))).intValue();
+							value = htmlEntities.get(escape);
 						}
 					}
-				} catch (NumberFormatException x) {
+				} catch (NumberFormatException ignored) {
 				}
-				result.append(s.substring(lastEnd, ampInd));
+				result.append(s, lastEnd, ampInd);
 				lastEnd = nextSemi + 1;
 				if (value >= 0 && value <= 0xffff) {
 					result.append((char) value);
@@ -506,8 +502,8 @@ public static String decode(String s) {
 	}
 
 	private void processWorkBook(InputStream inputStream) throws NumberFormatException, IOException {
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
-		String line = null;
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+		String line;
 		while ((line = bufferedReader.readLine()) != null) {
 			for (String sheetTag : StringUtilities.multiFindBetween(line, "<sheet ", "/>")) {
 				String name = StringUtilities.findBetween(sheetTag, "name=\"", "\"");
@@ -529,7 +525,7 @@ public class Sheet extends ArrayList<Row> {
 		private static final long	serialVersionUID	= -8597151681911998153L;
 		private String				name;
 		private int					order;
-		private Map<String, Integer> fieldName2ColumnIndex = new HashMap<>();
+		private final Map<String, Integer> fieldName2ColumnIndex = new HashMap<>();
 
 		public boolean add(Row row) {
 			// Assume first row is the header, preprocess it
diff --git a/rabbitinahat/pom.xml b/rabbitinahat/pom.xml
index cc3c7e6d..567caabb 100644
--- a/rabbitinahat/pom.xml
+++ b/rabbitinahat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.3</version>
+        <version>0.10.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,6 +33,15 @@
                     </programs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -43,4 +52,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/DetailsPanel.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/DetailsPanel.java
index d9f45bbc..6fe6b24b 100644
--- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/DetailsPanel.java
+++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/DetailsPanel.java
@@ -29,6 +29,7 @@
 import java.awt.event.KeyEvent;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.*;
@@ -41,9 +42,6 @@
 import javax.swing.event.TableColumnModelListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import javax.swing.event.UndoableEditEvent;
-import javax.swing.event.UndoableEditListener;
-import javax.swing.table.TableColumn;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableModel;
 import javax.swing.text.Document;
@@ -54,19 +52,19 @@
 
 public class DetailsPanel extends JPanel implements DetailsListener {
 
-	public static Font			font				= new Font("default", Font.PLAIN, 18);
+	public static Font font = new Font("default", Font.PLAIN, 18);
 
-	private static final long	serialVersionUID	= 4477553676983048468L;
-	private Object				object;
-	private TablePanel			tablePanel;
-	private FieldPanel			fieldPanel;
-	private TargetFieldPanel	targetFieldPanel;
-	private ItemToItemMapPanel	itemToItemMapPanel;
-	private CardLayout			cardLayout			= new CardLayout();
-	private NumberFormat	    numberFormat 	    = NumberFormat.getNumberInstance();
-	private NumberFormat	    percentageFormat    = NumberFormat.getPercentInstance();
+	private static final long serialVersionUID = 4477553676983048468L;
+	private Object object;
+	private final TablePanel tablePanel;
+	private final FieldPanel fieldPanel;
+	private final TargetFieldPanel targetFieldPanel;
+	private final ItemToItemMapPanel itemToItemMapPanel;
+	private final CardLayout cardLayout = new CardLayout();
+	private final NumberFormat numberFormat = NumberFormat.getNumberInstance();
+	private final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
 
-	private UndoManager			undoManager;
+	private final UndoManager undoManager;
 	
 	public DetailsPanel() {
 		UIManager.put("Label.font", font);
@@ -132,23 +130,15 @@ public void refresh() {
 
 	private void addUndoToTextArea(JTextArea jta){
 		Document doc = jta.getDocument();
-		doc.addUndoableEditListener(new UndoableEditListener() {
-		    @Override
-		    public void undoableEditHappened(UndoableEditEvent e) {
-		        undoManager.addEdit(e.getEdit());
-		    }
-		});
+		doc.addUndoableEditListener(e -> undoManager.addEdit(e.getEdit()));
 		
 		InputMap im = jta.getInputMap(JComponent.WHEN_FOCUSED);
 		ActionMap am = jta.getActionMap();
 
-		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "Undo");
-		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "Redo");
+		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), "Undo");
+		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), "Redo");
 
 		am.put("Undo", new AbstractAction() {
-		    /**
-			 * 
-			 */
 			private static final long serialVersionUID = -3363877112423623107L;
 
 			@Override
@@ -164,9 +154,6 @@ public void actionPerformed(ActionEvent e) {
 		});
 		
 		am.put("Redo", new AbstractAction() {
-		    /**
-			 * 
-			 */
 			private static final long serialVersionUID = -5581878642285644039L;
 
 			@Override
@@ -185,12 +172,12 @@ private class TablePanel extends JPanel implements DocumentListener {
 
 		private static final long	serialVersionUID	= -4393026616049677944L;
 		private Table				table;
-		private JLabel				nameLabel			= new JLabel("");
-		private DescriptionTextArea description			= new DescriptionTextArea ("");
-		private JLabel				rowCountLabel		= new JLabel("");
-		private SimpleTableModel	fieldTable			= new SimpleTableModel("Field", "Type","Description");
-		private JTextArea			commentsArea		= new JTextArea();
-		private JTable 				displayTable 		= new JTable(fieldTable);
+		private final JLabel				nameLabel			= new JLabel("");
+		private final DescriptionTextArea description			= new DescriptionTextArea ("");
+		private final JLabel				rowCountLabel		= new JLabel("");
+		private final SimpleTableModel	fieldTable			= new SimpleTableModel("Field", "Type", "Description");
+		private final JTextArea			commentsArea		= new JTextArea();
+		private final JTable 				displayTable 		= new JTable(fieldTable);
 		
 
 		public TablePanel() {
@@ -247,8 +234,6 @@ public void columnRemoved(TableColumnModelEvent e) {
 					
 				}
 
-
-
 				@Override
 				public void columnSelectionChanged(ListSelectionEvent e) {
 					// TODO Auto-generated method stub
@@ -537,13 +522,12 @@ public void createValueList(Field field) {
 
 	private class ItemToItemMapPanel extends JPanel implements DocumentListener {
 
-		private static final long	serialVersionUID	= -4393026616049677944L;
-		private JLabel				sourceLabel			= new JLabel("");
-		private JLabel				targetLabel			= new JLabel("");
-		private JTextArea			logicArea			= new JTextArea();
-		private JTextArea			commentsArea		= new JTextArea();
-		// private FlexTable testTable = new FlexTable();
-		private ItemToItemMap		itemToItemMap;
+		private static final long serialVersionUID = -4393026616049677944L;
+		private final JLabel sourceLabel = new JLabel("");
+		private final JLabel targetLabel = new JLabel("");
+		private final JTextArea	logicArea = new JTextArea();
+		private final JTextArea commentsArea = new JTextArea();
+		private ItemToItemMap itemToItemMap;
 
 		public ItemToItemMapPanel() {
 			setLayout(new BorderLayout());
@@ -583,11 +567,6 @@ public ItemToItemMapPanel() {
 			commentsPanel.setPreferredSize(new Dimension(100, 200));
 
 			add(commentsPanel, BorderLayout.SOUTH);
-
-			// testTable.setMinimumSize(new Dimension(200, 200));
-			// JScrollPane testPanel = new JScrollPane(testTable);
-			// testPanel.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-			// add(testPanel, BorderLayout.SOUTH);
 		}
 
 		public void showItemToItemMap(ItemToItemMap itemToItemMap) {
@@ -624,11 +603,11 @@ public void removeUpdate(DocumentEvent e) {
 
 	}
 
-	private class SimpleTableModel implements TableModel {
+	private static class SimpleTableModel implements TableModel {
 
-		private List<TableModelListener>	listeners	= new ArrayList<TableModelListener>();
-		private List<List<String>>			data		= new ArrayList<List<String>>();
-		private String[]					columnNames;
+		private final List<TableModelListener> listeners = new ArrayList<>();
+		private final List<List<String>> data = new ArrayList<>();
+		private final String[] columnNames;
 
 		public void clear() {
 			data.clear();
@@ -641,9 +620,8 @@ private void notifyListeners() {
 		}
 
 		public void add(String... values) {
-			List<String> row = new ArrayList<String>(values.length);
-			for (int i = 0; i < values.length; i++)
-				row.add(values[i]);
+			List<String> row = new ArrayList<>(values.length);
+			row.addAll(Arrays.asList(values));
 			data.add(row);
 			notifyListeners();
 		}
diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/MappingPanel.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/MappingPanel.java
index 3d9e689a..42f3a736 100644
--- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/MappingPanel.java
+++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/MappingPanel.java
@@ -83,7 +83,7 @@ public class MappingPanel extends JPanel implements MouseListener, MouseMotionLi
 	private MappingPanel			slaveMappingPanel;
 	private boolean					showOnlyConnectedItems		= false;
 
-	private int						shortcutMask				= Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+	private int						shortcutMask				= Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
 
 	private String					lastSourceFilter			= "";
 	private String					lastTargetFilter			= "";
@@ -376,7 +376,7 @@ public void mouseClicked(MouseEvent event) {
 			selectedArrow = null;
 		}
 
-		if (!event.isShiftDown() && !((event.getModifiers() & shortcutMask) == shortcutMask)) {
+		if (!event.isShiftDown() && !((event.getModifiersEx() & shortcutMask) == shortcutMask)) {
 			for (LabeledRectangle component : cdmComponents) {
 				component.setSelected(false);
 			}
@@ -726,7 +726,7 @@ private void LabeledRectangleClicked(MouseEvent event, List<LabeledRectangle> co
 
 			if (component.contains(event.getPoint())) {
 
-				if ((event.getModifiers() & shortcutMask) == shortcutMask) { // Add one at a time
+				if ((event.getModifiersEx() & shortcutMask) == shortcutMask) { // Add one at a time
 					component.toggleSelected();
 				} else if (event.isShiftDown()) { // Add in consecutive order
 
diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
index eb578101..a8c53748 100644
--- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
+++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
@@ -74,15 +74,13 @@ public class RabbitInAHatMain implements ResizeListener {
 	public final static String		ACTION_FILTER						= "Filter";
 	public final static String		ACTION_MAKE_MAPPING					= "Make Mappings";
 	public final static String		ACTION_REMOVE_MAPPING				= "Remove Mappings";
-	public final static String		ACTION_SET_TARGET_V4				= "CDM v4";
-	public final static String		ACTION_SET_TARGET_V5				= "CDM v5.0.0";
-	public final static String		ACTION_SET_TARGET_V501				= "CDM v5.0.1";
-	public final static String		ACTION_SET_TARGET_V510				= "CDM v5.1.0";
-	public final static String		ACTION_SET_TARGET_V520				= "CDM v5.2.0";
-	public final static String		ACTION_SET_TARGET_V530				= "CDM v5.3.0";
-	public final static String		ACTION_SET_TARGET_V531				= "CDM v5.3.1";
-	public final static String		ACTION_SET_TARGET_V60				= "CDM v6.0";
-	public final static String 		ACTION_SET_TARGET_V60_O 			= "CDM v6.0 + Oncology";
+	public final static String		ACTION_SET_TARGET_V4  = "CDM v4";
+	public final static String 		ACTION_SET_TARGET_V50 = "CDM v5.0";
+	public final static String 		ACTION_SET_TARGET_V51 = "CDM v5.1";
+	public final static String 		ACTION_SET_TARGET_V52 = "CDM v5.2";
+	public final static String 		ACTION_SET_TARGET_V53 = "CDM v5.3";
+	public final static String 		ACTION_SET_TARGET_V54 = "CDM v5.4";
+	public final static String		ACTION_SET_TARGET_V60 = "CDM v6.0-beta";
 	public final static String		ACTION_ADD_STEM_TABLE				= "Add stem table";
 	public final static String		ACTION_REMOVE_STEM_TABLE			= "Remove stem table";
 	public final static String		ACTION_SET_TARGET_CUSTOM			= "Load Custom...";
@@ -144,7 +142,7 @@ public void windowClosing(WindowEvent e) {
 		frame.setJMenuBar(createMenuBar());
 
 		ETL etl = new ETL();
-		etl.setTargetDatabase(Database.generateCDMModel(CDMVersion.CDMV60));
+		etl.setTargetDatabase(Database.generateCDMModel(CDMVersion.CDMV54));
 
 		ObjectExchange.etl = etl;
 
@@ -227,7 +225,7 @@ private Image loadIcon(String name, JFrame f) {
 	private JMenuBar createMenuBar() {
 		JMenuBar menuBar = new JMenuBar();
 		JMenu fileMenu = new JMenu("File");
-		int menuShortcutMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+		int menuShortcutMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
 
 		menuBar.add(fileMenu);
 
@@ -248,20 +246,18 @@ private JMenuBar createMenuBar() {
 
 		Map<String, CDMVersion> cdmOptions = new LinkedHashMap<>();
 	 	cdmOptions.put(ACTION_SET_TARGET_V4, CDMVersion.CDMV4);
-		cdmOptions.put(ACTION_SET_TARGET_V5, CDMVersion.CDMV5);
-		cdmOptions.put(ACTION_SET_TARGET_V501, CDMVersion.CDMV501);
-		cdmOptions.put(ACTION_SET_TARGET_V510, CDMVersion.CDMV510);
-		cdmOptions.put(ACTION_SET_TARGET_V520, CDMVersion.CDMV520);
-		cdmOptions.put(ACTION_SET_TARGET_V530, CDMVersion.CDMV530);
-		cdmOptions.put(ACTION_SET_TARGET_V531, CDMVersion.CDMV531);
+		cdmOptions.put(ACTION_SET_TARGET_V50, CDMVersion.CDMV50);
+		cdmOptions.put(ACTION_SET_TARGET_V51, CDMVersion.CDMV51);
+		cdmOptions.put(ACTION_SET_TARGET_V52, CDMVersion.CDMV52);
+		cdmOptions.put(ACTION_SET_TARGET_V53, CDMVersion.CDMV53);
+		cdmOptions.put(ACTION_SET_TARGET_V54, CDMVersion.CDMV54);
 		cdmOptions.put(ACTION_SET_TARGET_V60, CDMVersion.CDMV60);
-		cdmOptions.put(ACTION_SET_TARGET_V60_O, CDMVersion.CDMV60_O);
 
 		JRadioButtonMenuItem targetCDM;
 		ButtonGroup targetGroup = new ButtonGroup();
 		for (String optionName : cdmOptions.keySet()) {
 			targetCDM = new JRadioButtonMenuItem(optionName);
-			if (optionName.equals(ACTION_SET_TARGET_V60)) {
+			if (optionName.equals(ACTION_SET_TARGET_V54)) {
 				targetCDM.setSelected(true);
 			}
 			targetGroup.add(targetCDM);
@@ -316,7 +312,7 @@ public JMenuItem addMenuItem(JMenu menu, String description, ActionListener acti
 			menuItem.addActionListener(actionListener);
 		}
 		if (keyEvent != null) {
-			menuItem.setAccelerator(KeyStroke.getKeyStroke(keyEvent, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+			menuItem.setAccelerator(KeyStroke.getKeyStroke(keyEvent, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
 		}
 		menu.add(menuItem);
 		return menuItem;
@@ -472,8 +468,13 @@ private void doSetTargetCustom(String filename) {
 				etl.copyETLMappings(ObjectExchange.etl);
 				tableMappingPanel.setMapping(etl.getTableToTableMapping());
 				ObjectExchange.etl = etl;
-			} catch (IOException e) {
-				// Do nothing if error
+			} catch (Exception e) {
+				e.printStackTrace();
+				JOptionPane.showMessageDialog(
+						null, e.getMessage(),
+						"Error loading custom target database",
+						JOptionPane.ERROR_MESSAGE
+				);
 			}
 		}
 
diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ETL.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ETL.java
index 55da8578..928c1b16 100644
--- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ETL.java
+++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/ETL.java
@@ -1,4 +1,5 @@
-/*******************************************************************************
+/*
+ ******************************************************************************
  * Copyright 2019 Observational Health Data Sciences and Informatics
  *
  * This file is part of WhiteRabbit
@@ -14,7 +15,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ *****************************************************************************
+ */
 package org.ohdsi.rabbitInAHat.dataModel;
 
 import java.io.FileInputStream;
@@ -22,7 +24,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.OutputStreamWriter;
+import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,7 +32,7 @@
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-
+import com.cedarsoftware.util.io.JsonIoException;
 import com.cedarsoftware.util.io.JsonReader;
 import com.cedarsoftware.util.io.JsonWriter;
 
@@ -41,8 +43,8 @@ public enum FileFormat {
 
 	private Database								sourceDb					= new Database();
 	private Database								cdmDb						= new Database();
-	private List<ItemToItemMap>						tableToTableMaps			= new ArrayList<ItemToItemMap>();
-	private Map<ItemToItemMap, List<ItemToItemMap>>	tableMapToFieldToFieldMaps	= new HashMap<ItemToItemMap, List<ItemToItemMap>>();
+	private final List<ItemToItemMap>						tableToTableMaps			= new ArrayList<>();
+	private final Map<ItemToItemMap, List<ItemToItemMap>>	tableMapToFieldToFieldMaps	= new HashMap<>();
 	private transient String						filename					= null;
 	private static final long						serialVersionUID			= 8987388381751618498L;
 
@@ -102,16 +104,13 @@ public void revertToNextState() {
 	}
 
 	public Mapping<Table> getTableToTableMapping() {
-		return new Mapping<Table>(sourceDb.getTables(), cdmDb.getTables(), tableToTableMaps);
+		return new Mapping<>(sourceDb.getTables(), cdmDb.getTables(), tableToTableMaps);
 	}
 
 	public Mapping<Field> getFieldToFieldMapping(Table sourceTable, Table targetTable) {
-		List<ItemToItemMap> fieldToFieldMaps = tableMapToFieldToFieldMaps.get(new ItemToItemMap(sourceTable, targetTable));
-		if (fieldToFieldMaps == null) {
-			fieldToFieldMaps = new ArrayList<ItemToItemMap>();
-			tableMapToFieldToFieldMaps.put(new ItemToItemMap(sourceTable, targetTable), fieldToFieldMaps);
-		}
-		return new Mapping<Field>(sourceTable.getFields(), targetTable.getFields(), fieldToFieldMaps);
+		ItemToItemMap key = new ItemToItemMap(sourceTable, targetTable);
+		List<ItemToItemMap> fieldToFieldMaps = tableMapToFieldToFieldMaps.computeIfAbsent(key, k -> new ArrayList<>());
+		return new Mapping<>(sourceTable.getFields(), targetTable.getFields(), fieldToFieldMaps);
 	}
 
 	public String getFilename() {
@@ -134,34 +133,32 @@ public Database getSourceDatabase() {
 		return sourceDb;
 	}
 
-	public String toJson() {
-		return JsonWriter.formatJson(JsonWriter.objectToJson(this));
+	public void writeJson(OutputStream stream) throws IOException {
+		Map<String, Object> args = new HashMap<>();
+		args.put("PRETTY_PRINT", true);
+		try (JsonWriter writer = new JsonWriter(stream, args)) {
+			writer.write(this);
+		} catch (JsonIoException ex) {
+			throw (IOException)ex.getCause();
+		}
 	}
 
 	public void save(String filename, FileFormat format) {
-		try {
+		try (FileOutputStream fileOutputStream = new FileOutputStream(filename)) {
 			switch (format) {
 				case Binary:
-					try (FileOutputStream fileOutputStream = new FileOutputStream(filename);
-							GZIPOutputStream gzipOutputStream = new GZIPOutputStream(fileOutputStream);
+					try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(fileOutputStream);
 							ObjectOutputStream out = new ObjectOutputStream(gzipOutputStream)) {
 						out.writeObject(this);
 					}
 					break;
 				case GzipJson:
-					String json = toJson();
-					try (FileOutputStream fileOutputStream = new FileOutputStream(filename);
-							GZIPOutputStream gzipOutputStream = new GZIPOutputStream(fileOutputStream);
-							OutputStreamWriter out = new OutputStreamWriter(gzipOutputStream, "UTF-8")) {
-						out.write(json);
+					try (GZIPOutputStream out = new GZIPOutputStream(fileOutputStream)) {
+						writeJson(out);
 					}
 					break;
 				case Json:
-					String json2 = toJson();
-					try (FileOutputStream fileOutputStream = new FileOutputStream(filename);
-							OutputStreamWriter out = new OutputStreamWriter(fileOutputStream, "UTF-8")) {
-						out.write(json2);
-					}
+					writeJson(fileOutputStream);
 					break;
 			}
 			this.filename = filename;
@@ -172,7 +169,7 @@ public void save(String filename, FileFormat format) {
 
 	/**
 	 * Create an ETL instance by reading a saved file
-	 * 
+	 *
 	 * @param filename
 	 *            path of the file
 	 * @param format
diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/StemTableFactory.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/StemTableFactory.java
index 604e7f27..ca8602aa 100644
--- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/StemTableFactory.java
+++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/dataModel/StemTableFactory.java
@@ -23,28 +23,22 @@ public static void addStemTable(ETL etl) {
 		Database targetDatabase = etl.getTargetDatabase();
 		InputStream tableStream;
 		InputStream mappingStream;
-		if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.0.1")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.0.1.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.0.1.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.1.0")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.1.0.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.1.0.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.2.0")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.2.0.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.2.0.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.3.0")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.3.0.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.3.0.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.3.1")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.3.1.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.3.1.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv5.3.1_oncology")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.3.1.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.3.1.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv6.0")) {
-			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV6.0.csv");
-			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV6.0.csv");
-		} else if (targetDatabase.getDbName().toLowerCase().equals("cdmv6.0_oncology")) {
+		if (targetDatabase.getDbName().equalsIgnoreCase("cdmv5.0")) {
+			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.0.csv");
+			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.0.csv");
+		} else if (targetDatabase.getDbName().equalsIgnoreCase("cdmv5.1")) {
+			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.1.csv");
+			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.1.csv");
+		} else if (targetDatabase.getDbName().equalsIgnoreCase("cdmv5.2")) {
+			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.2.csv");
+			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.2.csv");
+		} else if (targetDatabase.getDbName().equalsIgnoreCase("cdmv5.3")) {
+			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.3.csv");
+			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.3.csv");
+		} else if (targetDatabase.getDbName().equalsIgnoreCase("cdmv5.4")) {
+			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV5.4.csv");
+			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV5.4.csv");
+		} else if (targetDatabase.getDbName().equalsIgnoreCase("cdmv6.0")) {
 			tableStream = StemTableFactory.class.getResourceAsStream("StemTableV6.0.csv");
 			mappingStream = StemTableFactory.class.getResourceAsStream("StemTableDefaultMappingV6.0.csv");
 		} else {
@@ -56,7 +50,8 @@ public static void addStemTable(ETL etl) {
 			Table sourceStemTable = new Table();
 			sourceStemTable.setStem(true);
 			sourceStemTable.setName(STEM_TABLE_NAME);
-			for (CSVRecord row : CSVFormat.RFC4180.withHeader().parse(new InputStreamReader(tableStream))) {
+			CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.RFC4180).setHeader().build();
+			for (CSVRecord row : csvFormat.parse(new InputStreamReader(tableStream))) {
 				Field field = new Field(row.get("COLUMN_NAME").toLowerCase(), sourceStemTable);
 				field.setNullable(row.get("IS_NULLABLE").equals("YES"));
 				field.setType(row.get("DATA_TYPE"));
@@ -70,8 +65,8 @@ public static void addStemTable(ETL etl) {
 			targetDatabase.getTables().add(targetStemTable);
 
 			Mapping<Table> mapping = etl.getTableToTableMapping();
-			Map<String, Table> nameToTable = new HashMap<String, Table>();
-			for (CSVRecord row : CSVFormat.RFC4180.withHeader().parse(new InputStreamReader(mappingStream))) {
+			Map<String, Table> nameToTable = new HashMap<>();
+			for (CSVRecord row : csvFormat.parse(new InputStreamReader(mappingStream))) {
 				String targetTableName = row.get("TARGET_TABLE");
 				Table targetTable = nameToTable.get(targetTableName);
 				if (targetTable == null) {
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.0.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.0.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.0.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.0.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.1.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.1.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.1.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.1.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.2.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.2.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.2.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.2.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.0.csv
deleted file mode 100644
index 03ab97cf..00000000
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.0.csv
+++ /dev/null
@@ -1,407 +0,0 @@
-"field","required","type","description","table"
-"condition_occurrence_id","Yes","INTEGER","A unique identifier for each Condition Occurrence event.","condition_occurrence"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is experiencing the condition. The demographic details of that Person are stored in the PERSON table.","condition_occurrence"
-"condition_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Condition Concept identifier in the Standardized Vocabularies.","condition_occurrence"
-"condition_start_date","Yes","DATE","The date when the instance of the Condition is recorded.","condition_occurrence"
-"condition_start_datetime","No","DATETIME","The date and time when the instance of the Condition is recorded.","condition_occurrence"
-"condition_end_date","No","DATE","The date when the instance of the Condition is considered to have ended.","condition_occurrence"
-"condition_end_datetime","No","DATE","The date when the instance of the Condition is considered to have ended.","condition_occurrence"
-"condition_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the condition was recorded, the level of standardization, and the type of occurrence.","condition_occurrence"
-"stop_reason","No","VARCHAR(20)","The reason that the condition was no longer present, as indicated in the source data.","condition_occurrence"
-"provider_id","No","INTEGER","A foreign key to the Provider in the PROVIDER table who was responsible for capturing (diagnosing) the Condition.","condition_occurrence"
-"visit_occurrence_id","No","INTEGER","A foreign key to the visit in the VISIT_OCCURRENCE table during which the Condition was determined (diagnosed).","condition_occurrence"
-"visit_detail_id","No","INTEGER","A foreign key to the visit in the VISIT_DETAIL table during which the Condition was determined (diagnosed).","condition_occurrence"
-"condition_source_value","No","VARCHAR(50)","The source code for the condition as it appears in the source data. This code is mapped to a standard condition concept in the Standardized Vocabularies and the original code is stored here for reference.","condition_occurrence"
-"condition_source_concept_id","No","INTEGER","A foreign key to a Condition Concept that refers to the code used in the source.","condition_occurrence"
-"condition_status_source_value","No","VARCHAR(50)","The source code for the condition status as it appears in the source data.","condition_occurrence"
-"condition_status_concept_id","No","INTEGER","A foreign key to the predefined Concept in the Standard Vocabulary reflecting the condition status","condition_occurrence"
-"person_id","Yes","INTEGER","A foreign key identifier to the deceased person. The demographic details of that person are stored in the person table.","death"
-"death_date","Yes","DATE","The date the person was deceased. If the precise date including day or month is not known or not allowed, December is used as the default month, and the last day of the month the default day.","death"
-"death_datetime","No","DATETIME","The date and time the person was deceased. If the precise date including day or month is not known or not allowed, December is used as the default month, and the last day of the month the default day.","death"
-"death_type_concept_id","Yes","INTEGER","A foreign key referring to the predefined concept identifier in the Standardized Vocabularies reflecting how the death was represented in the source data.","death"
-"cause_concept_id","No","INTEGER","A foreign key referring to a standard concept identifier in the Standardized Vocabularies for conditions.","death"
-"cause_source_value","No","VARCHAR(50)","The source code for the cause of death as it appears in the source data. This code is mapped to a standard concept in the Standardized Vocabularies and the original code is, stored here for reference.","death"
-"cause_source_concept_id","No","INTEGER","A foreign key to the concept that refers to the code used in the source. Note, this variable name is abbreviated to ensure it will be allowable across database platforms.","death"
-"device_exposure_id","Yes","INTEGER","A system-generated unique identifier for each Device Exposure.","device_exposure"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is subjected to the Device. The demographic details of that person are stored in the Person table.","device_exposure"
-"device_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Device concept.","device_exposure"
-"device_exposure_start_date","Yes","DATE","The date the Device or supply was applied or used.","device_exposure"
-"device_exposure_start_datetime","No","DATETIME","The date and time the Device or supply was applied or used.","device_exposure"
-"device_exposure_end_date","No","DATE","The date the Device or supply was removed from use.","device_exposure"
-"device_exposure_end_datetime","No","DATETIME","The date and time the Device or supply was removed from use.","device_exposure"
-"device_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Device Exposure recorded. It indicates how the Device Exposure was represented in the source data.","device_exposure"
-"unique_device_id","No","VARCHAR(50)","A UDI or equivalent identifying the instance of the Device used in the Person.","device_exposure"
-"quantity","No","INTEGER","The number of individual Devices used for the exposure.","device_exposure"
-"provider_id","No","INTEGER","A foreign key to the provider in the PROVIDER table who initiated of administered the Device.","device_exposure"
-"visit_occurrence_id","No","INTEGER","A foreign key to the visit in the VISIT_OCCURRENCE table during which the device was used.","device_exposure"
-"visit_detail_id","No","INTEGER","A foreign key to the visit detail in the VISIT_DETAIL table during which the Drug Exposure was initiated.","device_exposure"
-"device_source_value","No","VARCHAR(50)","The source code for the Device as it appears in the source data. This code is mapped to a standard Device Concept in the Standardized Vocabularies and the original code is stored here for reference.","device_exposure"
-"device_source_ concept_id","No","INTEGER","A foreign key to a Device Concept that refers to the code used in the source.","device_exposure"
-"drug_exposure_id","Yes","INTEGER","A system-generated unique identifier for each Drug utilization event.","drug_exposure"
-"person_id","Yes","INTEGER","A foreign key identifier to the person who is subjected to the Drug. The demographic details of that person are stored in the person table.","drug_exposure"
-"drug_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Drug concept.","drug_exposure"
-"drug_exposure_start_date","Yes","DATE","The start date for the current instance of Drug utilization. Valid entries include a start date of a prescription, the date a prescription was filled, or the date on which a Drug administration procedure was recorded.","drug_exposure"
-"drug_exposure_start_datetime","No","DATETIME","The start date and time for the current instance of Drug utilization. Valid entries include a start date of a prescription, the date a prescription was filled, or the date on which a Drug administration procedure was recorded.","drug_exposure"
-"drug_exposure_end_date","Yes","DATE","The end date for the current instance of Drug utilization. It is not available from all sources.","drug_exposure"
-"drug_exposure_end_datetime","No","DATETIME","The end date and time for the current instance of Drug utilization. It is not available from all sources.","drug_exposure"
-"verbatim_end_date","No","DATE","The known end date of a drug_exposure as provided by the source","drug_exposure"
-"drug_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Drug Exposure recorded. It indicates how the Drug Exposure was represented in the source data.","drug_exposure"
-"stop_reason","No","VARCHAR(20)","The reason the Drug was stopped. Reasons include regimen completed, changed, removed, etc.","drug_exposure"
-"refills","No","INTEGER","The number of refills after the initial prescription. The initial prescription is not counted, values start with 0.","drug_exposure"
-"quantity","No","FLOAT","The quantity of drug as recorded in the original prescription or dispensing record.","drug_exposure"
-"days_supply","No","INTEGER","The number of days of supply of the medication as recorded in the original prescription or dispensing record.","drug_exposure"
-"sig","No","VARCHAR(MAX)","The directions (""signetur"") on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.","drug_exposure"
-"route_concept_id","No","INTEGER","A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration.","drug_exposure"
-"lot_number","No","VARCHAR(50)","An identifier assigned to a particular quantity or lot of Drug product from the manufacturer.","drug_exposure"
-"provider_id","No","INTEGER","A foreign key to the provider in the PROVIDER table who initiated (prescribed or administered) the Drug Exposure.","drug_exposure"
-"visit_occurrence_id","No","INTEGER","A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Drug Exposure was initiated.","drug_exposure"
-"visit_detail_id","No","INTEGER","A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Drug Exposure was initiated.","drug_exposure"
-"drug_source_value","No","VARCHAR(50)","The source code for the Drug as it appears in the source data. This code is mapped to a Standard Drug concept in the Standardized Vocabularies and the original code is, stored here for reference.","drug_exposure"
-"drug_source_concept_id","No","INTEGER","A foreign key to a Drug Concept that refers to the code used in the source.","drug_exposure"
-"route_source_value","No","VARCHAR(50)","The information about the route of administration as detailed in the source.","drug_exposure"
-"dose_unit_source_value","No","VARCHAR(50)","The information about the dose unit as detailed in the source.","drug_exposure"
-"domain_concept_id_1","Yes","INTEGER","The concept representing the domain of fact one, from which the corresponding table can be inferred.","fact_relationship"
-"fact_id_1","Yes","INTEGER","The unique identifier in the table corresponding to the domain of fact one.","fact_relationship"
-"domain_concept_id_2","Yes","INTEGER","The concept representing the domain of fact two, from which the corresponding table can be inferred.","fact_relationship"
-"fact_id_2","Yes","INTEGER","The unique identifier in the table corresponding to the domain of fact two.","fact_relationship"
-"relationship_concept_id","Yes","INTEGER","A foreign key to a Standard Concept ID of relationship in the Standardized Vocabularies.","fact_relationship"
-"measurement_id","Yes","INTEGER","A unique identifier for each Measurement.","measurement"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person about whom the measurement was recorded. The demographic details of that Person are stored in the PERSON table.","measurement"
-"measurement_concept_id","Yes","INTEGER","A foreign key to the standard measurement concept identifier in the Standardized Vocabularies.","measurement"
-"measurement_date","Yes","DATE","The date of the Measurement.","measurement"
-"measurement_datetime","No","DATETIME","The date and time of the Measurement. Some database systems don't have a datatype of time. To accomodate all temporal analyses, datatype datetime can be used (combining measurement_date and measurement_time [forum discussion](http://forums.ohdsi.org/t/date-time-and-datetime-problem-and-the-world-of-hours-and-1day/314))","measurement"
-"measurement_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the provenance from where the Measurement record was recorded.","measurement"
-"operator_concept_id","No","INTEGER","A foreign key identifier to the predefined Concept in the Standardized Vocabularies reflecting the mathematical operator that is applied to the value_as_number. Operators are <, <=, =, >=, >.","measurement"
-"value_as_number","No","FLOAT","A Measurement result where the result is expressed as a numeric value.","measurement"
-"value_as_concept_id","No","INTEGER","A foreign key to a Measurement result represented as a Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).","measurement"
-"unit_concept_id","No","INTEGER","A foreign key to a Standard Concept ID of Measurement Units in the Standardized Vocabularies.","measurement"
-"range_low","No","FLOAT","The lower limit of the normal range of the Measurement result. The lower range is assumed to be of the same unit of measure as the Measurement value.","measurement"
-"range_high","No","FLOAT","The upper limit of the normal range of the Measurement. The upper range is assumed to be of the same unit of measure as the Measurement value.","measurement"
-"provider_id","No","INTEGER","A foreign key to the provider in the PROVIDER table who was responsible for initiating or obtaining the measurement.","measurement"
-"visit_occurrence_id","No","INTEGER","A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Measurement was recorded.","measurement"
-"visit_detail_id","No","INTEGER","A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Measurement was recorded.","measurement"
-"measurement_source_value","No","VARCHAR(50)","The Measurement name as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference.","measurement"
-"measurement_source_concept_id","No","INTEGER","A foreign key to a Concept in the Standard Vocabularies that refers to the code used in the source.","measurement"
-"unit_source_value","No","VARCHAR(50)","The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is stored here for reference.","measurement"
-"value_source_value","No","VARCHAR(50)","The source value associated with the content of the value_as_number or value_as_concept_id as stored in the source data.","measurement"
-"note_id","Yes","INTEGER","A unique identifier for each note.","note"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person about whom the Note was recorded. The demographic details of that Person are stored in the PERSON table.","note"
-"note_date","Yes","DATE","The date the note was recorded.","note"
-"note_datetime","No","DATETIME","The date and time the note was recorded.","note"
-"note_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the type, origin or provenance of the Note.","note"
-"note_class_concept_id","Yes","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the HL7 LOINC Document Type Vocabulary classification of the note.","note"
-"note_title","No","VARCHAR(250)","The title of the Note as it appears in the source.","note"
-"note_text","Yes","VARCHAR(MAX)","The content of the Note.","note"
-"encoding_concept_id","Yes","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the note character encoding type","note"
-"language_concept_id","Yes","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the language of the note","note"
-"provider_id","No","INTEGER","A foreign key to the Provider in the PROVIDER table who took the Note.","note"
-"visit_occurrence_id","No","INTEGER","A foreign key to the Visit in the VISIT_OCCURRENCE table when the Note was taken.","note"
-"visit_detail_id","No","INTEGER","A foreign key to the Visit in the VISIT_DETAIL table when the Note was taken.","note"
-"note_source_value","No","VARCHAR(50)","The source value associated with the origin of the Note","note"
-"note_nlp_id","Yes","INTEGER","A unique identifier for each term extracted from a note.","note_nlp"
-"note_id","Yes","INTEGER","A foreign key to the Note table note the term was extracted from.","note_nlp"
-"section_concept_id","No","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies representing the section of the extracted term.","note_nlp"
-"snippet","No","VARCHAR(250)","A small window of text surrounding the term.","note_nlp"
-"offset","No","VARCHAR(50)","Character offset of the extracted term in the input note.","note_nlp"
-"lexical_variant","Yes","VARCHAR(250)","Raw text extracted from the NLP tool.","note_nlp"
-"note_nlp_concept_id","No","INTEGER","A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the normalized concept for the extracted term. Domain of the term is represented as part of the Concept table.","note_nlp"
-"note_nlp_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code in the source vocabulary used by the NLP system","note_nlp"
-"nlp_system","No","VARCHAR(250)","Name and version of the NLP system that extracted the term.Useful for data provenance.","note_nlp"
-"nlp_date","Yes","DATE","The date of the note processing.Useful for data provenance.","note_nlp"
-"nlp_date_time","No","DATETIME","The date and time of the note processing. Useful for data provenance.","note_nlp"
-"term_exists","No","VARCHAR(1)","A summary modifier that signifies presence or absence of the term for a given patient. Useful for quick querying. *","note_nlp"
-"term_temporal","No","VARCHAR(50)","An optional time modifier associated with the extracted term. (for now �past� or �present� only). Standardize it later.","note_nlp"
-"term_modifiers","No","VARCHAR(2000)","A compact description of all the modifiers of the specific term extracted by the NLP system. (e.g. �son has rash� ? �negated=no,subject=family, certainty=undef,conditional=false,general=false�).","note_nlp"
-"observation_id","Yes","INTEGER","A unique identifier for each observation.","observation"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person about whom the observation was recorded. The demographic details of that Person are stored in the PERSON table.","observation"
-"observation_concept_id","Yes","INTEGER","A foreign key to the standard observation concept identifier in the Standardized Vocabularies.","observation"
-"observation_date","Yes","DATE","The date of the observation.","observation"
-"observation_datetime","No","DATETIME","The date and time of the observation.","observation"
-"observation_type_concept_id","Yes","INTEGER","A foreign key to the predefined concept identifier in the Standardized Vocabularies reflecting the type of the observation.","observation"
-"value_as_number","No","FLOAT","The observation result stored as a number. This is applicable to observations where the result is expressed as a numeric value.","observation"
-"value_as_string","No","VARCHAR(60)","The observation result stored as a string. This is applicable to observations where the result is expressed as verbatim text.","observation"
-"value_as_concept_id","No","INTEGER","A foreign key to an observation result stored as a Concept ID. This is applicable to observations where the result can be expressed as a Standard Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).","observation"
-"qualifier_concept_id","No","INTEGER","A foreign key to a Standard Concept ID for a qualifier (e.g., severity of drug-drug interaction alert)","observation"
-"unit_concept_id","No","INTEGER","A foreign key to a Standard Concept ID of measurement units in the Standardized Vocabularies.","observation"
-"provider_id","No","INTEGER","A foreign key to the provider in the PROVIDER table who was responsible for making the observation.","observation"
-"visit_occurrence_id","No","INTEGER","A foreign key to the visit in the VISIT_OCCURRENCE table during which the observation was recorded.","observation"
-"visit_detail_id","No","INTEGER","A foreign key to the visit in the VISIT_DETAIL table during which the observation was recorded.","observation"
-"observation_source_value","No","VARCHAR(50)","The observation code as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.","observation"
-"observation_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code used in the source.","observation"
-"unit_source_value","No","VARCHAR(50)","The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is, stored here for reference.","observation"
-"qualifier_source_value","No","VARCHAR(50)","The source value associated with a qualifier to characterize the observation","observation"
-"observation_period_id","Yes","INTEGER","A unique identifier for each observation period.","observation_period"
-"person_id","Yes","INTEGER","A foreign key identifier to the person for whom the observation period is defined. The demographic details of that person are stored in the person table.","observation_period"
-"observation_period_start_date","Yes","DATE","The start date of the observation period for which data are available from the data source.","observation_period"
-"observation_period_end_date","Yes","DATE","The end date of the observation period for which data are available from the data source.","observation_period"
-"period_type_concept_id","Yes","INTEGER","A foreign key identifier to the predefined concept in the Standardized Vocabularies reflecting the source of the observation period information","observation_period"
-"person_id","Yes","INTEGER","A unique identifier for each person.","person"
-"gender_concept_id","Yes","INTEGER","A foreign key that refers to an identifier in the CONCEPT table for the unique gender of the person.","person"
-"year_of_birth","Yes","INTEGER","The year of birth of the person. For data sources with date of birth, the year is extracted. For data sources where the year of birth is not available, the approximate year of birth is derived based on any age group categorization available.","person"
-"month_of_birth","No","INTEGER","The month of birth of the person. For data sources that provide the precise date of birth, the month is extracted and stored in this field.","person"
-"day_of_birth","No","INTEGER","The day of the month of birth of the person. For data sources that provide the precise date of birth, the day is extracted and stored in this field.","person"
-"birth_datetime","No","DATETIME","The date and time of birth of the person.","person"
-"race_concept_id","Yes","INTEGER","A foreign key that refers to an identifier in the CONCEPT table for the unique race of the person.","person"
-"ethnicity_concept_id","Yes","INTEGER","A foreign key that refers to the standard concept identifier in the Standardized Vocabularies for the ethnicity of the person.","person"
-"location_id","No","INTEGER","A foreign key to the place of residency for the person in the location table, where the detailed address information is stored.","person"
-"provider_id","No","INTEGER","A foreign key to the primary care provider the person is seeing in the provider table.","person"
-"care_site_id","No","INTEGER","A foreign key to the site of primary care in the care_site table, where the details of the care site are stored.","person"
-"person_source_value","No","VARCHAR(50)","An (encrypted) key derived from the person identifier in the source data. This is necessary when a use case requires a link back to the person data at the source dataset.","person"
-"gender_source_value","No","VARCHAR(50)","The source code for the gender of the person as it appears in the source data. The person’s gender is mapped to a standard gender concept in the Standardized Vocabularies; the original value is stored here for reference.","person"
-"gender_source_concept_id","No","INTEGER","A foreign key to the gender concept that refers to the code used in the source.","person"
-"race_source_value","No","VARCHAR(50)","The source code for the race of the person as it appears in the source data. The person race is mapped to a standard race concept in the Standardized Vocabularies and the original value is stored here for reference.","person"
-"race_source_concept_id","No","INTEGER","A foreign key to the race concept that refers to the code used in the source.","person"
-"ethnicity_source_value","No","VARCHAR(50)","The source code for the ethnicity of the person as it appears in the source data. The person ethnicity is mapped to a standard ethnicity concept in the Standardized Vocabularies and the original code is, stored here for reference.","person"
-"ethnicity_source_concept_id","No","INTEGER","A foreign key to the ethnicity concept that refers to the code used in the source.","person"
-"procedure_occurrence_id","Yes","INTEGER","A system-generated unique identifier for each Procedure Occurrence.","procedure_occurrence"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is subjected to the Procedure. The demographic details of that Person are stored in the PERSON table.","procedure_occurrence"
-"procedure_concept_id","Yes","INTEGER","A foreign key that refers to a standard procedure Concept identifier in the Standardized Vocabularies.","procedure_occurrence"
-"procedure_date","Yes","DATE","The date on which the Procedure was performed.","procedure_occurrence"
-"procedure_datetime","No","DATETIME","The date and time on which the Procedure was performed.","procedure_occurrence"
-"procedure_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the procedure record is derived.","procedure_occurrence"
-"modifier_concept_id","No","INTEGER","A foreign key to a Standard Concept identifier for a modifier to the Procedure (e.g. bilateral)","procedure_occurrence"
-"quantity","No","INTEGER","The quantity of procedures ordered or administered.","procedure_occurrence"
-"provider_id","No","INTEGER","A foreign key to the provider in the PROVIDER table who was responsible for carrying out the procedure.","procedure_occurrence"
-"visit_occurrence_id","No","INTEGER","A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Procedure was carried out.","procedure_occurrence"
-"visit_detail_id","No","INTEGER","A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Procedure was carried out.","procedure_occurrence"
-"procedure_source_value","No","VARCHAR(50)","The source code for the Procedure as it appears in the source data. This code is mapped to a standard procedure Concept in the Standardized Vocabularies and the original code is, stored here for reference. Procedure source codes are typically ICD-9-Proc, CPT-4, HCPCS or OPCS-4 codes.","procedure_occurrence"
-"procedure_source_concept_id","No","INTEGER","A foreign key to a Procedure Concept that refers to the code used in the source.","procedure_occurrence"
-"modifier_source_value","No","VARCHAR(50)","The source code for the qualifier as it appears in the source data.","procedure_occurrence"
-"specimen_id","Yes","INTEGER","A unique identifier for each specimen.","specimen"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person for whom the Specimen is recorded.","specimen"
-"specimen_concept_id","Yes","INTEGER","A foreign key referring to a Standard Concept identifier in the Standardized Vocabularies for the Specimen.","specimen"
-"specimen_type_concept_id","Yes","INTEGER","A foreign key referring to the Concept identifier in the Standardized Vocabularies reflecting the system of record from which the Specimen was represented in the source data.","specimen"
-"specimen_date","Yes","DATE","The date the specimen was obtained from the Person.","specimen"
-"specimen_datetime","No","DATETIME","The date and time on the date when the Specimen was obtained from the person.","specimen"
-"quantity","No","FLOAT","The amount of specimen collection from the person during the sampling procedure.","specimen"
-"unit_concept_id","No","INTEGER","A foreign key to a Standard Concept identifier for the Unit associated with the numeric quantity of the Specimen collection.","specimen"
-"anatomic_site_concept_id","No","INTEGER","A foreign key to a Standard Concept identifier for the anatomic location of specimen collection.","specimen"
-"disease_status_concept_id","No","INTEGER","A foreign key to a Standard Concept identifier for the Disease Status of specimen collection.","specimen"
-"specimen_source_id","No","VARCHAR(50)","The Specimen identifier as it appears in the source data.","specimen"
-"specimen_source_value","No","VARCHAR(50)","The Specimen value as it appears in the source data. This value is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.","specimen"
-"unit_source_value","No","VARCHAR(50)","The information about the Unit as detailed in the source.","specimen"
-"anatomic_site_source_value","No","VARCHAR(50)","The information about the anatomic site as detailed in the source.","specimen"
-"disease_status_source_value","No","VARCHAR(50)","The information about the disease status as detailed in the source.","specimen"
-"visit_detail_id","Yes","INTEGER","A unique identifier for each Person's visit or encounter at a healthcare provider.","visit_detail"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person for whom the visit is recorded. The demographic details of that Person are stored in the PERSON table.","visit_detail"
-"visit_detail_concept_id","Yes","INTEGER","A foreign key that refers to a visit Concept identifier in the Standardized Vocabularies.","visit_detail"
-"visit_start_date","Yes","DATE","The start date of the visit.","visit_detail"
-"visit_start_datetime","No","DATETIME","The date and time of the visit started.","visit_detail"
-"visit_end_date","Yes","DATE","The end date of the visit. If this is a one-day visit the end date should match the start date.","visit_detail"
-"visit_end_datetime","No","DATETIME","The date and time of the visit end.","visit_detail"
-"visit_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the visit record is derived.","visit_detail"
-"provider_id","No","INTEGER","A foreign key to the provider in the provider table who was associated with the visit.","visit_detail"
-"care_site_id","No","INTEGER","A foreign key to the care site in the care site table that was visited.","visit_detail"
-"visit_source_value","No","STRING(50)","The source code for the visit as it appears in the source data.","visit_detail"
-"visit_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code used in the source.","visit_detail"
-"admitting_source_value","Varchar(50)","NO","The source code for the admitting source as it appears in the source data.","visit_detail"
-"admitting_source_concept_id","Integer","NO","A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the admitting source for a visit.","visit_detail"
-"discharge_to_source_value","Varchar(50)","NO","The source code for the discharge disposition as it appears in the source data.","visit_detail"
-"discharge_to_concept_id","Integer","NO","A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the discharge disposition for a visit.","visit_detail"
-"preceding_visit_detail_id","Integer","NO","A foreign key to the VISIT_DETAIL table of the visit immediately preceding this visit","visit_detail"
-"visit_detail_parent_id","Integer","NO","A foreign key to the VISIT_DETAIL table record to represent the immediate parent visit-detail record.","visit_detail"
-"visit_occurrence_id","Integer","YES","A foreign key that refers to the record in the VISIT_OCCURRENCE table. This is a required field, because for every visit_detail is a child of visit_occurrence and cannot exist without a corresponding parent record in visit_occurrence.","visit_detail"
-"visit_occurrence_id","Yes","INTEGER","A unique identifier for each Person's visit or encounter at a healthcare provider.","visit_occurrence"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person for whom the visit is recorded. The demographic details of that Person are stored in the PERSON table.","visit_occurrence"
-"visit_concept_id","Yes","INTEGER","A foreign key that refers to a visit Concept identifier in the Standardized Vocabularies.","visit_occurrence"
-"visit_start_date","Yes","DATE","The start date of the visit.","visit_occurrence"
-"visit_start_datetime","No","DATETIME","The date and time of the visit started.","visit_occurrence"
-"visit_end_date","Yes","DATE","The end date of the visit. If this is a one-day visit the end date should match the start date.","visit_occurrence"
-"visit_end_datetime","No","DATETIME","The date and time of the visit end.","visit_occurrence"
-"visit_type_concept_id","Yes","INTEGER","A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the visit record is derived.","visit_occurrence"
-"provider_id","No","INTEGER","A foreign key to the provider in the provider table who was associated with the visit.","visit_occurrence"
-"care_site_id","No","INTEGER","A foreign key to the care site in the care site table that was visited.","visit_occurrence"
-"visit_source_value","No","VARCHAR(50)","The source code for the visit as it appears in the source data.","visit_occurrence"
-"visit_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code used in the source.","visit_occurrence"
-"admitting_source_concept_id","integer","NO","A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the admitting source for a visit.","visit_occurrence"
-"admitting_source_value","varchar(50)","NO","The source code for the admitting source as it appears in the source data.","visit_occurrence"
-"discharge_to_concept_id","integer","NO","A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the discharge disposition for a visit.","visit_occurrence"
-"discharge_to_source_value","varchar(50)","NO","The source code for the discharge disposition as it appears in the source data.","visit_occurrence"
-"preceding_visit_occurrence_id","integer","NO","A foreign key to the VISIT_OCCURRENCE table of the visit immediately preceding this visit","visit_occurrence"
-"cohort_definition_id","Yes","INTEGER","A foreign key to a record in the COHORT_DEFINITION table containing relevant Cohort Definition information.","cohort"
-"subject_id","Yes","INTEGER","A foreign key to the subject in the cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.","cohort"
-"cohort_start_date","Yes","DATE","The date when the Cohort Definition criteria for the Person, Provider or Visit first match.","cohort"
-"cohort_end_date","Yes","DATE","The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.","cohort"
-"cohort_definition_id","Yes","INTEGER","A foreign key to a record in the [COHORT_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/COHORT_DEFINITION) table containing relevant Cohort Definition information.","cohort_attribute"
-"subject_id","Yes","INTEGER","A foreign key to the subject in the Cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.","cohort_attribute"
-"cohort_start_date","Yes","DATE","The date when the Cohort Definition criteria for the Person, Provider or Visit first match.","cohort_attribute"
-"cohort_end_date","Yes","DATE","The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.","cohort_attribute"
-"attribute_definition_id","Yes","INTEGER","A foreign key to a record in the [ATTRIBUTE_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/ATTRIBUTE_DEFINITION) table containing relevant Attribute Definition information.","cohort_attribute"
-"value_as_number","No","FLOAT","The attribute result stored as a number. This is applicable to attributes where the result is expressed as a numeric value.","cohort_attribute"
-"value_as_concept_id","No","INTEGER","The attribute result stored as a Concept ID. This is applicable to attributes where the result is expressed as a categorical value.","cohort_attribute"
-"condition_era_id","Yes","INTEGER","A unique identifier for each Condition Era.","condition_era"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is experiencing the Condition during the Condition Era. The demographic details of that Person are stored in the PERSON table.","condition_era"
-"condition_concept_id","Yes","INTEGER","A foreign key that refers to a standard Condition Concept identifier in the Standardized Vocabularies.","condition_era"
-"condition_era_start_date","Yes","DATE","The start date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the start date of the very first chronologically recorded instance of the condition.","condition_era"
-"condition_era_end_date","Yes","DATE","The end date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the end date of the final continuously recorded instance of the Condition.","condition_era"
-"condition_occurrence_count","No","INTEGER","The number of individual Condition Occurrences used to construct the condition era.","condition_era"
-"dose_era_id","Yes","INTEGER","A unique identifier for each Dose Era.","dose_era"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is subjected to the drug during the drug era. The demographic details of that Person are stored in the PERSON table.","dose_era"
-"drug_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the active Ingredient Concept.","dose_era"
-"unit_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the unit concept.","dose_era"
-"dose_value","Yes","FLOAT","The numeric value of the dose.","dose_era"
-"dose_era_start_date","Yes","DATE","The start date for the drug era constructed from the individual instances of drug exposures. It is the start date of the very first chronologically recorded instance of utilization of a drug.","dose_era"
-"dose_era_end_date","Yes","DATE","The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.","dose_era"
-"drug_era_id","Yes","INTEGER","A unique identifier for each Drug Era.","drug_era"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person who is subjected to the Drug during the fDrug Era. The demographic details of that Person are stored in the PERSON table.","drug_era"
-"drug_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Ingredient Concept.","drug_era"
-"drug_era_start_date","Yes","DATE","The start date for the Drug Era constructed from the individual instances of Drug Exposures. It is the start date of the very first chronologically recorded instance of conutilization of a Drug.","drug_era"
-"drug_era_end_date","Yes","DATE","The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.","drug_era"
-"drug_exposure_count","No","INTEGER","The number of individual Drug Exposure occurrences used to construct the Drug Era.","drug_era"
-"gap_days","No","INTEGER","The number of days that are not covered by DRUG_EXPOSURE records that were used to make up the era record.","drug_era"
-"cost_id","Yes","INTEGER","A unique identifier for each COST record.","cost"
-"cost_event_id","Yes","INTEGER","A foreign key identifier to the event (e.g. Measurement, Procedure, Visit, Drug Exposure, etc) record for which cost data are recorded.","cost"
-"cost_domain_id","Yes","VARCHAR(20)","The concept representing the domain of the cost event, from which the corresponding table can be inferred that contains the entity for which cost information is recorded.","cost"
-"cost_type_concept_id","Yes","INTEGER","A foreign key identifier to a concept in the CONCEPT table for the provenance or the source of the COST data: Calculated from insurance claim information, provider revenue, calculated from cost-to-charge ratio, reported from accounting database, etc.","cost"
-"currency_concept_id","No","INTEGER","A foreign key identifier to the concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.","cost"
-"total_charge","No","FLOAT","The total amount charged by some provider of goods or services (e.g. hospital, physician pharmacy, dme provider) to payers (insurance companies, the patient).","cost"
-"total_cost","No","FLOAT","The cost incurred by the provider of goods or services.","cost"
-"total_paid","No","FLOAT","The total amount actually paid from all payers for goods or services of the provider.","cost"
-"paid_by_payer","No","FLOAT","The amount paid by the Payer for the goods or services.","cost"
-"paid_by_patient","No","FLOAT","The total amount paid by the Person as a share of the expenses.","cost"
-"paid_patient_copay","No","FLOAT","The amount paid by the Person as a fixed contribution to the expenses.","cost"
-"paid_patient_coinsurance","No","FLOAT","The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the Payer Plan after the Person's deductible is exceeded.","cost"
-"paid_patient_deductible","No","FLOAT","The amount paid by the Person that is counted toward the deductible defined by the Payer Plan. paid_patient_deductible does contribute to the paid_by_patient variable.","cost"
-"paid_by_primary","No","FLOAT","The amount paid by a primary Payer through the coordination of benefits.","cost"
-"paid_ingredient_cost","No","FLOAT","The amount paid by the Payer to a pharmacy for the drug, excluding the amount paid for dispensing the drug.  paid_ingredient_cost contributes to the paid_by_payer field if this field is populated with a nonzero value.","cost"
-"paid_dispensing_fee","No","FLOAT","The amount paid by the Payer to a pharmacy for dispensing a drug, excluding the amount paid for the drug ingredient. paid_dispensing_fee contributes to the paid_by_payer field if this field is populated with a nonzero value.","cost"
-"payer_plan_period_id","No","INTEGER","A foreign key to the PAYER_PLAN_PERIOD table, where the details of the Payer, Plan and Family are stored.  Record the payer_plan_id that relates to the payer who contributed to the paid_by_payer field.","cost"
-"amount_allowed","No","FLOAT","The contracted amount agreed between the payer and provider.","cost"
-"revenue_code_concept_id","No","INTEGER","A foreign key referring to a Standard Concept ID in the Standardized Vocabularies for Revenue codes.","cost"
-"revenue_code_source_value","No","VARCHAR(50)","The source code for the Revenue code as it appears in the source data, stored here for reference.","cost"
-"drg_concept_id","No","INTEGER","A foreign key to the predefined concept in the DRG Vocabulary reflecting the DRG for a visit.","cost"
-"drg_source_value","No","VARCHAR(3)","The 3-digit DRG source code as it appears in the source data.","cost"
-"payer_plan_period_id","Yes","INTEGER","A identifier for each unique combination of payer, plan, family code and time span.","payer_plan_period"
-"person_id","Yes","INTEGER","A foreign key identifier to the Person covered by the payer. The demographic details of that Person are stored in the PERSON table.","payer_plan_period"
-"payer_plan_period_start_date","Yes","DATE","The start date of the payer plan period.","payer_plan_period"
-"payer_plan_period_end_date","Yes","DATE","The end date of the payer plan period.","payer_plan_period"
-"payer_concept_id","No","INTEGER","A foreign key that refers to a standard Payer concept identifier in the Standarized Vocabularies","payer_plan_period"
-"payer_source_value","No","VARCHAR(50)","The source code for the payer as it appears in the source data.","payer_plan_period"
-"payer_source_concept_id","No","INTEGER","A foreign key to a payer concept that refers to the code used in the source.","payer_plan_period"
-"plan_concept_id","No","INTEGER","A foreign key that refers to a standard plan concept identifier that represents the health benefit plan in the Standardized Vocabularies","payer_plan_period"
-"plan_source_value","No","VARCHAR(50)","The source code for the Person's health benefit plan as it appears in the source data.","payer_plan_period"
-"plan_source_concept_id","No","INTEGER","A foreign key to a plan concept that refers to the plan code used in the source data.","payer_plan_period"
-"sponsor_concept_id","No","INTEGER","A foreign key that refers to a concept identifier that represents the sponsor in the Standardized Vocabularies.","payer_plan_period"
-"sponsor_source_value","No","VARCHAR(50)","The source code for the Person's sponsor of the health plan as it appears in the source data.","payer_plan_period"
-"sponsor_source_concept_id","No","INTEGER","A foreign key to a sponsor concept that refers to the sponsor code used in the source data.","payer_plan_period"
-"family_source_value","No","VARCHAR(50)","The source code for the Person's family as it appears in the source data.","payer_plan_period"
-"stop_reason_concept_id","No","INTEGER","A foreign key that refers to a standard termination reason that represents the reason for the termination in the Standardized Vocabularies.","payer_plan_period"
-"stop_reason_source_value","No","VARCHAR(50)","The reason for stop-coverage as it appears in the source data.","payer_plan_period"
-"stop_reason_source_concept_id","No","INTEGER","A foreign key to a stop-coverage concept that refers to the code used in the source.","payer_plan_period"
-"care_site_id","Yes","INTEGER","A unique identifier for each Care Site.","care_site"
-"care_site_name","No","VARCHAR(255)","The verbatim description or name of the Care Site as in data source","care_site"
-"place_of_service_concept_id","No","INTEGER","A foreign key that refers to a Place of Service Concept ID in the Standardized Vocabularies.","care_site"
-"location_id","No","INTEGER","A foreign key to the geographic Location in the LOCATION table, where the detailed address information is stored.","care_site"
-"care_site_source_value","No","VARCHAR(50)","The identifier for the Care Site in the source data, stored here for reference.","care_site"
-"place_of_service_source_value","No","VARCHAR(50)","The source code for the Place of Service as it appears in the source data, stored here for reference.","care_site"
-"location_id","Yes","INTEGER","A unique identifier for each geographic location.","location"
-"address_1","No","VARCHAR(50)","The address field 1, typically used for the street address, as it appears in the source data.","location"
-"address_2","No","VARCHAR(50)","The address field 2, typically used for additional detail such as buildings, suites, floors, as it appears in the source data.","location"
-"city","No","VARCHAR(50)","The city field as it appears in the source data.","location"
-"state","No","VARCHAR(2)","The state field as it appears in the source data.","location"
-"zip","No","VARCHAR(9)","The zip or postal code.","location"
-"county","No","VARCHAR(20)","The county.","location"
-"location_source_value","No","VARCHAR(50)","The verbatim information that is used to uniquely identify the location as it appears in the source data.","location"
-"provider_id","Yes","INTEGER","A unique identifier for each Provider.","provider"
-"provider_name","No","VARCHAR(255)","A description of the Provider.","provider"
-"npi","No","VARCHAR(20)","The National Provider Identifier (NPI) of the provider.","provider"
-"dea","No","VARCHAR(20)","The Drug Enforcement Administration (DEA) number of the provider.","provider"
-"specialty_concept_id","No","INTEGER","A foreign key to a Standard Specialty Concept ID in the Standardized Vocabularies.","provider"
-"care_site_id","No","INTEGER","A foreign key to the main Care Site where the provider is practicing.","provider"
-"year_of_birth","No","INTEGER","The year of birth of the Provider.","provider"
-"gender_concept_id","No","INTEGER","The gender of the Provider.","provider"
-"provider_source_value","No","VARCHAR(50)","The identifier used for the Provider in the source data, stored here for reference.","provider"
-"specialty_source_value","No","VARCHAR(50)","The source code for the Provider specialty as it appears in the source data, stored here for reference.","provider"
-"specialty_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code used in the source.","provider"
-"gender_source_value","No","VARCHAR(50)","The gender code for the Provider as it appears in the source data, stored here for reference.","provider"
-"gender_source_concept_id","No","INTEGER","A foreign key to a Concept that refers to the code used in the source.","provider"
-"cdm_source_name","Yes","VARCHAR(255)","The full name of the source","cdm_source"
-"cdm_source_abbreviation","No","VARCHAR(25)","An abbreviation of the name","cdm_source"
-"cdm_holder","No","VARCHAR(255)","The name of the organization responsible for the development of the CDM instance","cdm_source"
-"source_description","No","CLOB","A description of the source data origin and purpose for collection. The description may contain a summary of the period of time that is expected to be covered by this dataset.","cdm_source"
-"source_documentation_reference","No","VARCHAR(255)","URL or other external reference to location of source documentation","cdm_source"
-"cdm_etl _reference","No","VARCHAR(255)","URL or other external reference to location of ETL specification documentation and ETL source code","cdm_source"
-"source_release_date","No","DATE","The date for which the source data are most current, such as the last day of data capture","cdm_source"
-"cdm_release_date","No","DATE","The date when the CDM was instantiated","cdm_source"
-"cdm_version","No","VARCHAR(10)","The version of CDM used","cdm_source"
-"vocabulary_version","No","VARCHAR(20)","The version of the vocabulary used","cdm_source"
-"metadata_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Metadata Concept identifier in the Standardized Vocabularies.","metadata"
-"metadata_type_concept_id","Yes","INTEGER","A foreign key that refers to a Standard Type Concept identifier in the Standardized Vocabularies.","metadata"
-"name","Yes","VARCHAR(250)","The name of the Concept stored in metadata_concept_id or a description of the data being stored.","metadata"
-"value_as_string","No","NVARCHAR","The metadata value stored as a string.","metadata"
-"value_as_concept_id","No","INTEGER","A foreign key to a metadata value stored as a Concept ID.","metadata"
-"metadata date","No","DATE","The date associated with the metadata","metadata"
-"metadata_datetime","No","DATETIME","The date and time associated with the metadata","metadata"
-"attribute_definition_id","Yes","INTEGER","A unique identifier for each Attribute.","attribute_definition"
-"attribute_name","Yes","VARCHAR(255)","A short description of the Attribute.","attribute_definition"
-"attribute_description","No","VARCHAR(MAX)","A complete description of the Attribute definition","attribute_definition"
-"attribute_type_concept_id","Yes","INTEGER","Type defining what kind of Attribute Definition the record represents and how the syntax may be executed","attribute_definition"
-"attribute_syntax","No","VARCHAR(MAX)","Syntax or code to operationalize the Attribute definition","attribute_definition"
-"cohort_definition_id","Yes","INTEGER","A unique identifier for each Cohort.","cohort_definition"
-"cohort_definition_name","Yes","VARCHAR(255)","A short description of the Cohort.","cohort_definition"
-"cohort_definition_description","No","VARCHAR(MAX)","A complete description of the Cohort definition","cohort_definition"
-"definition_type_concept_id","Yes","INTEGER","Type defining what kind of Cohort Definition the record represents and how the syntax may be executed","cohort_definition"
-"cohort_definition_syntax","No","VARCHAR(MAX)","Syntax or code to operationalize the Cohort definition","cohort_definition"
-"subject_concept_id","Yes","INTEGER","A foreign key to the Concept to which defines the domain of subjects that are members of the cohort (e.g., Person, Provider, Visit).","cohort_definition"
-"cohort_instantiation_date","No","DATE","A date to indicate when the Cohort was instantiated in the COHORT table","cohort_definition"
-"concept_id","Yes","INTEGER","A unique identifier for each Concept across all domains.","concept"
-"concept_name","Yes","VARCHAR(255)","An unambiguous, meaningful and descriptive name for the Concept.","concept"
-"domain_id","Yes","VARCHAR(20)","A foreign key to the [DOMAIN](https://github.com/OHDSI/CommonDataModel/wiki/DOMAIN) table the Concept belongs to.","concept"
-"vocabulary_id","Yes","VARCHAR(20)","A foreign key to the [VOCABULARY](https://github.com/OHDSI/CommonDataModel/wiki/VOCABULARY) table indicating from which source the Concept has been adapted.","concept"
-"concept_class_id","Yes","VARCHAR(20)","The attribute or concept class of the Concept. Examples are 'Clinical Drug', 'Ingredient', 'Clinical Finding' etc.","concept"
-"standard_concept","No","VARCHAR(1)","This flag determines where a Concept is a Standard Concept, i.e. is used in the data, a Classification Concept, or a non-standard Source Concept. The allowables values are 'S' (Standard Concept) and 'C' (Classification Concept), otherwise the content is NULL.","concept"
-"concept_code","Yes","VARCHAR(50)","The concept code represents the identifier of the Concept in the source vocabulary, such as SNOMED-CT concept IDs, RxNorm RXCUIs etc. Note that concept codes are not unique across vocabularies.","concept"
-"valid_start_date","Yes","DATE","The date when the Concept was first recorded. The default value is 1-Jan-1970, meaning, the Concept has no (known) date of inception.","concept"
-"valid_end_date","Yes","DATE","The date when the Concept became invalid because it was deleted or superseded (updated) by a new concept. The default value is 31-Dec-2099, meaning, the Concept is valid until it becomes deprecated.","concept"
-"invalid_reason","No","VARCHAR(1)","Reason the Concept was invalidated. Possible values are D (deleted), U (replaced with an update) or NULL when valid_end_date has the default value.","concept"
-"ancestor_concept_id","Yes","INTEGER","A foreign key to the concept in the concept table for the higher-level concept that forms the ancestor in the relationship.","concept_ancestor"
-"descendant_concept_id","Yes","INTEGER","A foreign key to the concept in the concept table for the lower-level concept that forms the descendant in the relationship.","concept_ancestor"
-"min_levels_of_separation","Yes","INTEGER","The minimum separation in number of levels of hierarchy between ancestor and descendant concepts. This is an attribute that is used to simplify hierarchic analysis.","concept_ancestor"
-"max_levels_of_separation","Yes","INTEGER","The maximum separation in number of levels of hierarchy between ancestor and descendant concepts. This is an attribute that is used to simplify hierarchic analysis.","concept_ancestor"
-"concept_class_id","Yes","VARCHAR(20)","A unique key for each class.","concept_class"
-"concept_class_name","Yes","VARCHAR(255)","The name describing the Concept Class, e.g. ""Clinical Finding"", ""Ingredient"", etc.","concept_class"
-"concept_class_concept_id","Yes","INTEGER","A foreign key that refers to an identifier in the [CONCEPT](https://github.com/OHDSI/CommonDataModel/wiki/CONCEPT) table for the unique Concept Class the record belongs to.","concept_class"
-"concept_id_1","Yes","INTEGER","A foreign key to a Concept in the [CONCEPT](https://github.com/OHDSI/CommonDataModel/wiki/CONCEPT) table associated with the relationship. Relationships are directional, and this field represents the source concept designation.","concept_relationship"
-"concept_id_2","Yes","INTEGER","A foreign key to a Concept in the [CONCEPT](https://github.com/OHDSI/CommonDataModel/wiki/CONCEPT) table associated with the relationship. Relationships are directional, and this field represents the destination concept designation.","concept_relationship"
-"relationship_id","Yes","VARCHAR(20)","A unique identifier to the type or nature of the Relationship as defined in the [RELATIONSHIP](https://github.com/OHDSI/CommonDataModel/wiki/RELATIONSHIP) table.","concept_relationship"
-"valid_start_date","Yes","DATE","The date when the instance of the Concept Relationship is first recorded.","concept_relationship"
-"valid_end_date","Yes","DATE","The date when the Concept Relationship became invalid because it was deleted or superseded (updated) by a new relationship. Default value is 31-Dec-2099.","concept_relationship"
-"invalid_reason","No","VARCHAR(1)","Reason the relationship was invalidated. Possible values are 'D' (deleted), 'U' (replaced with an update) or NULL when valid_end_date has the default value.","concept_relationship"
-"concept_id","Yes","INTEGER","A foreign key to the Concept in the CONCEPT table.","concept_synonym"
-"concept_synonym_name","Yes","VARCHAR(1000)","The alternative name for the Concept.","concept_synonym"
-"language_concept_id","Yes","INTEGER","A foreign key to a Concept representing the language.","concept_synonym"
-"domain_id","Yes","VARCHAR(20)","A unique key for each domain.","domain"
-"domain_name","Yes","VARCHAR(255)","The name describing the Domain, e.g. ""Condition"", ""Procedure"", ""Measurement"" etc.","domain"
-"domain_concept_id","Yes","INTEGER","A foreign key that refers to an identifier in the [CONCEPT](https://github.com/OHDSI/CommonDataModel/wiki/CONCEPT) table for the unique Domain Concept the Domain record belongs to.","domain"
-"drug_concept_id","Yes","INTEGER","A foreign key to the Concept in the CONCEPT table representing the identifier for Branded Drug or Clinical Drug Concept.","drug_strength"
-"ingredient_concept_id","Yes","INTEGER","A foreign key to the Concept in the CONCEPT table, representing the identifier for drug Ingredient Concept contained within the drug product.","drug_strength"
-"amount_value","No","FLOAT","The numeric value associated with the amount of active ingredient contained within the product.","drug_strength"
-"amount_unit_concept_id","No","INTEGER","A foreign key to the Concept in the CONCEPT table representing the identifier for the Unit for the absolute amount of active ingredient.","drug_strength"
-"numerator_value","No","FLOAT","The numeric value associated with the concentration of the active ingredient contained in the product","drug_strength"
-"numerator_unit_concept_id","No","INTEGER","A foreign key to the Concept in the CONCEPT table representing the identifier for the numerator Unit for the concentration of active ingredient.","drug_strength"
-"denominator_value","No","FLOAT","The amount of total liquid (or other divisible product, such as ointment, gel, spray, etc.).","drug_strength"
-"denominator_unit_concept_id","No","INTEGER","A foreign key to the Concept in the CONCEPT table representing the identifier for the denominator Unit for the concentration of active ingredient.","drug_strength"
-"box_size","No","INTEGER","The number of units of Clinical of Branded Drug, or Quantified Clinical or Branded Drug contained in a box as dispensed to the patient","drug_strength"
-"valid_start_date","Yes","DATE","The date when the Concept was first recorded. The default value is 1-Jan-1970.","drug_strength"
-"valid_end_date","Yes","DATE","The date when the concept became invalid because it was deleted or superseded (updated) by a new Concept. The default value is 31-Dec-2099.","drug_strength"
-"invalid_reason","No","VARCHAR(1)","Reason the concept was invalidated. Possible values are 'D' (deleted), 'U' (replaced with an update) or NULL when valid_end_date has the default value.","drug_strength"
-"relationship_id","Yes","VARCHAR(20)","The type of relationship captured by the relationship record.","relationship"
-"relationship_name","Yes","VARCHAR(255)","The text that describes the relationship type.","relationship"
-"is_hierarchical","Yes","VARCHAR(1)","Defines whether a relationship defines concepts into classes or hierarchies. Values are 1 for hierarchical relationship or 0 if not.","relationship"
-"defines_ancestry","Yes","VARCHAR(1)","Defines whether a hierarchical relationship contributes to the concept_ancestor table. These are subsets of the hierarchical relationships. Valid values are 1 or 0.","relationship"
-"reverse_relationship_id","Yes","VARCHAR(20)","The identifier for the relationship used to define the reverse relationship between two concepts.","relationship"
-"relationship_concept_id","Yes","INTEGER","A foreign key that refers to an identifier in the CONCEPT table for the unique relationship concept.","relationship"
-"source_code","Yes","VARCHAR(50)","The source code being translated into a Standard Concept.","source_to_concept_map"
-"source_concept_id","Yes","INTEGER","A foreign key to the Source Concept that is being translated into a Standard Concept.","source_to_concept_map"
-"source_vocabulary_id","Yes","VARCHAR(20)","A foreign key to the VOCABULARY table defining the vocabulary of the source code that is being translated to a Standard Concept.","source_to_concept_map"
-"source_code_description","No","VARCHAR(255)","An optional description for the source code. This is included as a convenience to compare the description of the source code to the name of the concept.","source_to_concept_map"
-"target_concept_id","Yes","INTEGER","A foreign key to the target Concept to which the source code is being mapped.","source_to_concept_map"
-"target_vocabulary_id","Yes","VARCHAR(20)","A foreign key to the VOCABULARY table defining the vocabulary of the target Concept.","source_to_concept_map"
-"valid_start_date","Yes","DATE","The date when the mapping instance was first recorded.","source_to_concept_map"
-"valid_end_date","Yes","DATE","The date when the mapping instance became invalid because it was deleted or superseded (updated) by a new relationship. Default value is 31-Dec-2099.","source_to_concept_map"
-"invalid_reason","No","VARCHAR(1)","Reason the mapping instance was invalidated. Possible values are D (deleted), U (replaced with an update) or NULL when valid_end_date has the default value.","source_to_concept_map"
-"vocabulary_id","Yes","VARCHAR(20)","A unique identifier for each Vocabulary, such as ICD9CM, SNOMED, Visit.","vocabulary"
-"vocabulary_name","Yes","VARCHAR(255)","The name describing the vocabulary, for example ""International Classification of Diseases, Ninth Revision, Clinical Modification, Volume 1 and 2 (NCHS)"" etc.","vocabulary"
-"vocabulary_reference","Yes","VARCHAR(255)","External reference to documentation or available download of the about the vocabulary.","vocabulary"
-"vocabulary_version","Yes","VARCHAR(255)","Version of the Vocabulary as indicated in the source.","vocabulary"
-"vocabulary_concept_id","Yes","INTEGER","A foreign key that refers to a standard concept identifier in the CONCEPT table for the Vocabulary the VOCABULARY record belongs to.","vocabulary"
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.1_Oncology.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.1_Oncology.csv
deleted file mode 100644
index 7684396f..00000000
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.1_Oncology.csv
+++ /dev/null
@@ -1,363 +0,0 @@
-field,required,type,description,table,schema
-condition_occurrence_id,Yes,INTEGER,A unique identifier for each Condition Occurrence event.,condition_occurrence,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is experiencing the condition. The demographic details of that Person are stored in the PERSON table.,condition_occurrence,cdm
-condition_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Condition Concept identifier in the Standardized Vocabularies.,condition_occurrence,cdm
-condition_start_date,Yes,DATE,The date when the instance of the Condition is recorded.,condition_occurrence,cdm
-condition_start_datetime,No,DATETIME,The date and time when the instance of the Condition is recorded.,condition_occurrence,cdm
-condition_end_date,No,DATE,The date when the instance of the Condition is considered to have ended.,condition_occurrence,cdm
-condition_end_datetime,No,DATE,The date when the instance of the Condition is considered to have ended.,condition_occurrence,cdm
-condition_type_concept_id,Yes,INTEGER,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the condition was recorded, the level of standardization, and the type of occurrence.",condition_occurrence,cdm
-stop_reason,No,VARCHAR(20),"The reason that the condition was no longer present, as indicated in the source data.",condition_occurrence,cdm
-provider_id,No,INTEGER,A foreign key to the Provider in the PROVIDER table who was responsible for capturing (diagnosing) the Condition.,condition_occurrence,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the visit in the VISIT_OCCURRENCE table during which the Condition was determined (diagnosed).,condition_occurrence,cdm
-visit_detail_id,No,INTEGER,A foreign key to the visit in the VISIT_DETAIL table during which the Condition was determined (diagnosed).,condition_occurrence,cdm
-condition_source_value,No,VARCHAR(50),The source code for the condition as it appears in the source data. This code is mapped to a standard condition concept in the Standardized Vocabularies and the original code is stored here for reference.,condition_occurrence,cdm
-condition_source_concept_id,No,INTEGER,A foreign key to a Condition Concept that refers to the code used in the source.,condition_occurrence,cdm
-condition_status_source_value,No,VARCHAR(50),The source code for the condition status as it appears in the source data.,condition_occurrence,cdm
-condition_status_concept_id,No,INTEGER,A foreign key to the predefined Concept in the Standard Vocabulary reflecting the condition status,condition_occurrence,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the deceased person. The demographic details of that person are stored in the person table.,death,cdm
-death_date,Yes,DATE,"The date the person was deceased. If the precise date including day or month is not known or not allowed, December is used as the default month, and the last day of the month the default day.",death,cdm
-death_datetime,No,DATETIME,"The date and time the person was deceased. If the precise date including day or month is not known or not allowed, December is used as the default month, and the last day of the month the default day.",death,cdm
-death_type_concept_id,Yes,INTEGER,A foreign key referring to the predefined concept identifier in the Standardized Vocabularies reflecting how the death was represented in the source data.,death,cdm
-cause_concept_id,No,INTEGER,A foreign key referring to a standard concept identifier in the Standardized Vocabularies for conditions.,death,cdm
-cause_source_value,No,VARCHAR(50),"The source code for the cause of death as it appears in the source data. This code is mapped to a standard concept in the Standardized Vocabularies and the original code is, stored here for reference.",death,cdm
-cause_source_concept_id,No,INTEGER,"A foreign key to the concept that refers to the code used in the source. Note, this variable name is abbreviated to ensure it will be allowable across database platforms.",death,cdm
-device_exposure_id,Yes,INTEGER,A system-generated unique identifier for each Device Exposure.,device_exposure,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is subjected to the Device. The demographic details of that person are stored in the Person table.,device_exposure,cdm
-device_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Device concept.,device_exposure,cdm
-device_exposure_start_date,Yes,DATE,The date the Device or supply was applied or used.,device_exposure,cdm
-device_exposure_start_datetime,No,DATETIME,The date and time the Device or supply was applied or used.,device_exposure,cdm
-device_exposure_end_date,No,DATE,The date the Device or supply was removed from use.,device_exposure,cdm
-device_exposure_end_datetime,No,DATETIME,The date and time the Device or supply was removed from use.,device_exposure,cdm
-device_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Device Exposure recorded. It indicates how the Device Exposure was represented in the source data.,device_exposure,cdm
-unique_device_id,No,VARCHAR(50),A UDI or equivalent identifying the instance of the Device used in the Person.,device_exposure,cdm
-quantity,No,INTEGER,The number of individual Devices used for the exposure.,device_exposure,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the PROVIDER table who initiated of administered the Device.,device_exposure,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the visit in the VISIT_OCCURRENCE table during which the device was used.,device_exposure,cdm
-visit_detail_id,No,INTEGER,A foreign key to the visit detail in the VISIT_DETAIL table during which the Drug Exposure was initiated.,device_exposure,cdm
-device_source_value,No,VARCHAR(50),The source code for the Device as it appears in the source data. This code is mapped to a standard Device Concept in the Standardized Vocabularies and the original code is stored here for reference.,device_exposure,cdm
-device_source_concept_id,No,INTEGER,A foreign key to a Device Concept that refers to the code used in the source.,device_exposure,cdm
-drug_exposure_id,Yes,INTEGER,A system-generated unique identifier for each Drug utilization event.,drug_exposure,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the person who is subjected to the Drug. The demographic details of that person are stored in the person table.,drug_exposure,cdm
-drug_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Drug concept.,drug_exposure,cdm
-drug_exposure_start_date,Yes,DATE,"The start date for the current instance of Drug utilization. Valid entries include a start date of a prescription, the date a prescription was filled, or the date on which a Drug administration procedure was recorded.",drug_exposure,cdm
-drug_exposure_start_datetime,No,DATETIME,"The start date and time for the current instance of Drug utilization. Valid entries include a start date of a prescription, the date a prescription was filled, or the date on which a Drug administration procedure was recorded.",drug_exposure,cdm
-drug_exposure_end_date,Yes,DATE,The end date for the current instance of Drug utilization. It is not available from all sources.,drug_exposure,cdm
-drug_exposure_end_datetime,No,DATETIME,The end date and time for the current instance of Drug utilization. It is not available from all sources.,drug_exposure,cdm
-verbatim_end_date,No,DATE,The known end date of a drug_exposure as provided by the source,drug_exposure,cdm
-drug_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Drug Exposure recorded. It indicates how the Drug Exposure was represented in the source data.,drug_exposure,cdm
-stop_reason,No,VARCHAR(20),"The reason the Drug was stopped. Reasons include regimen completed, changed, removed, etc.",drug_exposure,cdm
-refills,No,INTEGER,"The number of refills after the initial prescription. The initial prescription is not counted, values start with 0.",drug_exposure,cdm
-quantity,No,FLOAT,The quantity of drug as recorded in the original prescription or dispensing record.,drug_exposure,cdm
-days_supply,No,INTEGER,The number of days of supply of the medication as recorded in the original prescription or dispensing record.,drug_exposure,cdm
-sig,No,VARCHAR(MAX),"The directions (""signetur"") on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.",drug_exposure,cdm
-route_concept_id,No,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration.,drug_exposure,cdm
-lot_number,No,VARCHAR(50),An identifier assigned to a particular quantity or lot of Drug product from the manufacturer.,drug_exposure,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the PROVIDER table who initiated (prescribed or administered) the Drug Exposure.,drug_exposure,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Drug Exposure was initiated.,drug_exposure,cdm
-visit_detail_id,No,INTEGER,A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Drug Exposure was initiated.,drug_exposure,cdm
-drug_source_value,No,VARCHAR(50),"The source code for the Drug as it appears in the source data. This code is mapped to a Standard Drug concept in the Standardized Vocabularies and the original code is, stored here for reference.",drug_exposure,cdm
-drug_source_concept_id,No,INTEGER,A foreign key to a Drug Concept that refers to the code used in the source.,drug_exposure,cdm
-route_source_value,No,VARCHAR(50),The information about the route of administration as detailed in the source.,drug_exposure,cdm
-dose_unit_source_value,No,VARCHAR(50),The information about the dose unit as detailed in the source.,drug_exposure,cdm
-domain_concept_id_1,Yes,INTEGER,"The concept representing the domain of fact one, from which the corresponding table can be inferred.",fact_relationship,cdm
-fact_id_1,Yes,INTEGER,The unique identifier in the table corresponding to the domain of fact one.,fact_relationship,cdm
-domain_concept_id_2,Yes,INTEGER,"The concept representing the domain of fact two, from which the corresponding table can be inferred.",fact_relationship,cdm
-fact_id_2,Yes,INTEGER,The unique identifier in the table corresponding to the domain of fact two.,fact_relationship,cdm
-relationship_concept_id,Yes,INTEGER,A foreign key to a Standard Concept ID of relationship in the Standardized Vocabularies.,fact_relationship,cdm
-measurement_id,Yes,INTEGER,A unique identifier for each Measurement.,measurement,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person about whom the measurement was recorded. The demographic details of that Person are stored in the PERSON table.,measurement,cdm
-measurement_concept_id,Yes,INTEGER,A foreign key to the standard measurement concept identifier in the Standardized Vocabularies.,measurement,cdm
-measurement_date,Yes,DATE,The date of the Measurement.,measurement,cdm
-measurement_datetime,No,DATETIME,"The date and time of the Measurement. Some database systems don't have a datatype of time. To accomodate all temporal analyses, datatype datetime can be used (combining measurement_date and measurement_time [forum discussion](http://forums.ohdsi.org/t/date-time-and-datetime-problem-and-the-world-of-hours-and-1day/314))",measurement,cdm
-measurement_time,No,VARCHAR(10),The time of the Measurement. This is present for backwards compatibility and will deprecated in an upcoming version,measurement,cdm
-measurement_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the provenance from where the Measurement record was recorded.,measurement,cdm
-operator_concept_id,No,INTEGER,"A foreign key identifier to the predefined Concept in the Standardized Vocabularies reflecting the mathematical operator that is applied to the value_as_number. Operators are <, <=, =, >=, >.",measurement,cdm
-value_as_number,No,FLOAT,A Measurement result where the result is expressed as a numeric value.,measurement,cdm
-value_as_concept_id,No,INTEGER,"A foreign key to a Measurement result represented as a Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).",measurement,cdm
-unit_concept_id,No,INTEGER,A foreign key to a Standard Concept ID of Measurement Units in the Standardized Vocabularies.,measurement,cdm
-range_low,No,FLOAT,The lower limit of the normal range of the Measurement result. The lower range is assumed to be of the same unit of measure as the Measurement value.,measurement,cdm
-range_high,No,FLOAT,The upper limit of the normal range of the Measurement. The upper range is assumed to be of the same unit of measure as the Measurement value.,measurement,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the PROVIDER table who was responsible for initiating or obtaining the measurement.,measurement,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Measurement was recorded.,measurement,cdm
-visit_detail_id,No,INTEGER,A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Measurement was recorded.,measurement,cdm
-measurement_source_value,No,VARCHAR(50),The Measurement name as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference.,measurement,cdm
-measurement_source_concept_id,No,INTEGER,A foreign key to a Concept in the Standard Vocabularies that refers to the code used in the source.,measurement,cdm
-unit_source_value,No,VARCHAR(50),The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is stored here for reference.,measurement,cdm
-value_source_value,No,VARCHAR(50),The source value associated with the content of the value_as_number or value_as_concept_id as stored in the source data.,measurement,cdm
-modifier_of_event_id,No,INTEGER,"A foreign key identifier to the event (e.g. condition, procedure, episode) record for which the modifier is recorded.",measurement,cdm
-modifier_of_field_concept_id,No,INTEGER,	The concept representing the table field concept that contains the value of the event id for which the modifier is recorded (e.g. CONDITION_OCCURRENCE.condition_occurrence_id).,measurement,cdm
-note_id,Yes,INTEGER,A unique identifier for each note.,note,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person about whom the Note was recorded. The demographic details of that Person are stored in the PERSON table.,note,cdm
-note_date,Yes,DATE,The date the note was recorded.,note,cdm
-note_datetime,No,DATETIME,The date and time the note was recorded.,note,cdm
-note_type_concept_id,Yes,INTEGER,"A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the type, origin or provenance of the Note.",note,cdm
-note_class_concept_id,Yes,INTEGER,A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the HL7 LOINC Document Type Vocabulary classification of the note.,note,cdm
-note_title,No,VARCHAR(250),The title of the Note as it appears in the source.,note,cdm
-note_text,Yes,VARCHAR(MAX),The content of the Note.,note,cdm
-encoding_concept_id,Yes,INTEGER,A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the note character encoding type,note,cdm
-language_concept_id,Yes,INTEGER,A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the language of the note,note,cdm
-provider_id,No,INTEGER,A foreign key to the Provider in the PROVIDER table who took the Note.,note,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the Visit in the VISIT_OCCURRENCE table when the Note was taken.,note,cdm
-visit_detail_id,No,INTEGER,A foreign key to the Visit in the VISIT_DETAIL table when the Note was taken.,note,cdm
-note_source_value,No,VARCHAR(50),The source value associated with the origin of the Note,note,cdm
-note_nlp_id,Yes,INTEGER,A unique identifier for each term extracted from a Note.,note_nlp,cdm
-note_id,Yes,INTEGER,A foreign key to the note table note the term was extracted from.,note_nlp,cdm
-section_concept_id,No,INTEGER,A foreign key to the predefined concept in the standardized vocabularies representing the section of the extracted term.,note_nlp,cdm
-snippet,No,VARCHAR(250),A small window of text surrounding the term.,note_nlp,cdm
-offset,No,VARCHAR(50),Character offset of the extracted term in the input note.,note_nlp,cdm
-lexical_variant,Yes,VARCHAR(250),Raw text extracted from the NLP tool.,note_nlp,cdm
-note_nlp_concept_id,No,INTEGER,A foreign key to the predefined concept in the standardized vocabularies reflecting the normalized concept for the extracted term. Domain of the term is represented as part of the concept table.,note_nlp,cdm
-note_nlp_source_concept_id,No,INTEGER,A foreign key to a concept that refers to the code in the source vocabulary used by the NLP system,note_nlp,cdm
-nlp_system,No,VARCHAR(250),Name and version of the NLP system that extracted the term.useful for data provenance.,note_nlp,cdm
-nlp_date,Yes,DATE,The date of the note processing.useful for data provenance.,note_nlp,cdm
-nlp_datetime,No,DATETIME,The date and time of the note processing. Useful for data provenance.,note_nlp,cdm
-term_exists,No,VARCHAR(1),A summary modifier that signifies presence or absence of the term for a given patient. Useful for quick querying.,note_nlp,cdm
-term_temporal,No,VARCHAR(50),An optional time modifier associated with the extracted term. (For now “past� or “present� only). Standardize it later.,note_nlp,cdm
-term_modifiers,No,VARCHAR(2000),"A compact description of all the modifiers of the specific term extracted by the NLP system. (e.g. “son has rash� ? “negated=no,subject=family, certainty=undef,conditional=false,general=false�).",note_nlp,cdm
-observation_id,Yes,INTEGER,A unique identifier for each observation.,observation,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person about whom the observation was recorded. The demographic details of that Person are stored in the PERSON table.,observation,cdm
-observation_concept_id,Yes,INTEGER,A foreign key to the standard observation concept identifier in the Standardized Vocabularies.,observation,cdm
-observation_date,Yes,DATE,The date of the observation.,observation,cdm
-observation_datetime,No,DATETIME,The date and time of the observation.,observation,cdm
-observation_type_concept_id,Yes,INTEGER,A foreign key to the predefined concept identifier in the Standardized Vocabularies reflecting the type of the observation.,observation,cdm
-value_as_number,No,FLOAT,The observation result stored as a number. This is applicable to observations where the result is expressed as a numeric value.,observation,cdm
-value_as_string,No,VARCHAR(60),The observation result stored as a string. This is applicable to observations where the result is expressed as verbatim text.,observation,cdm
-value_as_concept_id,No,INTEGER,"A foreign key to an observation result stored as a Concept ID. This is applicable to observations where the result can be expressed as a Standard Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).",observation,cdm
-qualifier_concept_id,No,INTEGER,"A foreign key to a Standard Concept ID for a qualifier (e.g., severity of drug-drug interaction alert)",observation,cdm
-unit_concept_id,No,INTEGER,A foreign key to a Standard Concept ID of measurement units in the Standardized Vocabularies.,observation,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the PROVIDER table who was responsible for making the observation.,observation,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the visit in the VISIT_OCCURRENCE table during which the observation was recorded.,observation,cdm
-visit_detail_id,No,INTEGER,A foreign key to the visit in the VISIT_DETAIL table during which the observation was recorded.,observation,cdm
-observation_source_value,No,VARCHAR(50),"The observation code as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.",observation,cdm
-observation_source_concept_id,No,INTEGER,A foreign key to a Concept that refers to the code used in the source.,observation,cdm
-unit_source_value,No,VARCHAR(50),"The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is, stored here for reference.",observation,cdm
-qualifier_source_value,No,VARCHAR(50),The source value associated with a qualifier to characterize the observation,observation,cdm
-observation_period_id,Yes,INTEGER,A unique identifier for each observation period.,observation_period,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the person for whom the observation period is defined. The demographic details of that person are stored in the person table.,observation_period,cdm
-observation_period_start_date,Yes,DATE,The start date of the observation period for which data are available from the data source.,observation_period,cdm
-observation_period_end_date,Yes,DATE,The end date of the observation period for which data are available from the data source.,observation_period,cdm
-period_type_concept_id,Yes,INTEGER,A foreign key identifier to the predefined concept in the Standardized Vocabularies reflecting the source of the observation period information,observation_period,cdm
-person_id,Yes,INTEGER,A unique identifier for each person.,person,cdm
-gender_concept_id,Yes,INTEGER,A foreign key that refers to an identifier in the CONCEPT table for the unique gender of the person.,person,cdm
-year_of_birth,Yes,INTEGER,"The year of birth of the person. For data sources with date of birth, the year is extracted. For data sources where the year of birth is not available, the approximate year of birth is derived based on any age group categorization available.",person,cdm
-month_of_birth,No,INTEGER,"The month of birth of the person. For data sources that provide the precise date of birth, the month is extracted and stored in this field.",person,cdm
-day_of_birth,No,INTEGER,"The day of the month of birth of the person. For data sources that provide the precise date of birth, the day is extracted and stored in this field.",person,cdm
-birth_datetime,No,DATETIME,The date and time of birth of the person.,person,cdm
-race_concept_id,Yes,INTEGER,A foreign key that refers to an identifier in the CONCEPT table for the unique race of the person.,person,cdm
-ethnicity_concept_id,Yes,INTEGER,A foreign key that refers to the standard concept identifier in the Standardized Vocabularies for the ethnicity of the person.,person,cdm
-location_id,No,INTEGER,"A foreign key to the place of residency for the person in the location table, where the detailed address information is stored.",person,cdm
-provider_id,No,INTEGER,A foreign key to the primary care provider the person is seeing in the provider table.,person,cdm
-care_site_id,No,INTEGER,"A foreign key to the site of primary care in the care_site table, where the details of the care site are stored.",person,cdm
-person_source_value,No,VARCHAR(50),An (encrypted) key derived from the person identifier in the source data. This is necessary when a use case requires a link back to the person data at the source dataset.,person,cdm
-gender_source_value,No,VARCHAR(50),The source code for the gender of the person as it appears in the source data. The person’s gender is mapped to a standard gender concept in the Standardized Vocabularies; the original value is stored here for reference.,person,cdm
-gender_source_concept_id,No,INTEGER,A foreign key to the gender concept that refers to the code used in the source.,person,cdm
-race_source_value,No,VARCHAR(50),The source code for the race of the person as it appears in the source data. The person race is mapped to a standard race concept in the Standardized Vocabularies and the original value is stored here for reference.,person,cdm
-race_source_concept_id,No,INTEGER,A foreign key to the race concept that refers to the code used in the source.,person,cdm
-ethnicity_source_value,No,VARCHAR(50),"The source code for the ethnicity of the person as it appears in the source data. The person ethnicity is mapped to a standard ethnicity concept in the Standardized Vocabularies and the original code is, stored here for reference.",person,cdm
-ethnicity_source_concept_id,No,INTEGER,A foreign key to the ethnicity concept that refers to the code used in the source.,person,cdm
-procedure_occurrence_id,Yes,INTEGER,A system-generated unique identifier for each Procedure Occurrence.,procedure_occurrence,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is subjected to the Procedure. The demographic details of that Person are stored in the PERSON table.,procedure_occurrence,cdm
-procedure_concept_id,Yes,INTEGER,A foreign key that refers to a standard procedure Concept identifier in the Standardized Vocabularies.,procedure_occurrence,cdm
-procedure_date,Yes,DATE,The date on which the Procedure was performed.,procedure_occurrence,cdm
-procedure_datetime,No,DATETIME,The date and time on which the Procedure was performed.,procedure_occurrence,cdm
-procedure_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the procedure record is derived.,procedure_occurrence,cdm
-modifier_concept_id,No,INTEGER,A foreign key to a Standard Concept identifier for a modifier to the Procedure (e.g. bilateral),procedure_occurrence,cdm
-quantity,No,INTEGER,The quantity of procedures ordered or administered.,procedure_occurrence,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the PROVIDER table who was responsible for carrying out the procedure.,procedure_occurrence,cdm
-visit_occurrence_id,No,INTEGER,A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Procedure was carried out.,procedure_occurrence,cdm
-visit_detail_id,No,INTEGER,A foreign key to the Visit Detail in the VISIT_DETAIL table during which the Procedure was carried out.,procedure_occurrence,cdm
-procedure_source_value,No,VARCHAR(50),"The source code for the Procedure as it appears in the source data. This code is mapped to a standard procedure Concept in the Standardized Vocabularies and the original code is, stored here for reference. Procedure source codes are typically ICD-9-Proc, CPT-4, HCPCS or OPCS-4 codes.",procedure_occurrence,cdm
-procedure_source_concept_id,No,INTEGER,A foreign key to a Procedure Concept that refers to the code used in the source.,procedure_occurrence,cdm
-modifier_source_value,No,VARCHAR(50),The source code for the qualifier as it appears in the source data.,procedure_occurrence,cdm
-specimen_id,Yes,INTEGER,A unique identifier for each specimen.,specimen,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person for whom the Specimen is recorded.,specimen,cdm
-specimen_concept_id,Yes,INTEGER,A foreign key referring to a Standard Concept identifier in the Standardized Vocabularies for the Specimen.,specimen,cdm
-specimen_type_concept_id,Yes,INTEGER,A foreign key referring to the Concept identifier in the Standardized Vocabularies reflecting the system of record from which the Specimen was represented in the source data.,specimen,cdm
-specimen_date,Yes,DATE,The date the specimen was obtained from the Person.,specimen,cdm
-specimen_datetime,No,DATETIME,The date and time on the date when the Specimen was obtained from the person.,specimen,cdm
-quantity,No,FLOAT,The amount of specimen collection from the person during the sampling procedure.,specimen,cdm
-unit_concept_id,No,INTEGER,A foreign key to a Standard Concept identifier for the Unit associated with the numeric quantity of the Specimen collection.,specimen,cdm
-anatomic_site_concept_id,No,INTEGER,A foreign key to a Standard Concept identifier for the anatomic location of specimen collection.,specimen,cdm
-disease_status_concept_id,No,INTEGER,A foreign key to a Standard Concept identifier for the Disease Status of specimen collection.,specimen,cdm
-specimen_source_id,No,VARCHAR(50),The Specimen identifier as it appears in the source data.,specimen,cdm
-specimen_source_value,No,VARCHAR(50),"The Specimen value as it appears in the source data. This value is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.",specimen,cdm
-unit_source_value,No,VARCHAR(50),The information about the Unit as detailed in the source.,specimen,cdm
-anatomic_site_source_value,No,VARCHAR(50),The information about the anatomic site as detailed in the source.,specimen,cdm
-disease_status_source_value,No,VARCHAR(50),The information about the disease status as detailed in the source.,specimen,cdm
-visit_detail_id,Yes,INTEGER,A unique identifier for each Person's visit or encounter at a healthcare provider.,visit_detail,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person for whom the visit is recorded. The demographic details of that Person are stored in the PERSON table.,visit_detail,cdm
-visit_detail_concept_id,Yes,INTEGER,A foreign key that refers to a visit Concept identifier in the Standardized Vocabularies.,visit_detail,cdm
-visit_detail_start_date,Yes,DATE,The start date of the visit.,visit_detail,cdm
-visit_detail_start_datetime,No,DATETIME,The date and time of the visit started.,visit_detail,cdm
-visit_detail_end_date,Yes,DATE,The end date of the visit. If this is a one-day visit the end date should match the start date.,visit_detail,cdm
-visit_detail_end_datetime,No,DATETIME,The date and time of the visit end.,visit_detail,cdm
-visit_detail_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the visit record is derived.,visit_detail,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the provider table who was associated with the visit.,visit_detail,cdm
-care_site_id,No,INTEGER,A foreign key to the care site in the care site table that was visited.,visit_detail,cdm
-visit_detail_source_value,No,STRING(50),The source code for the visit as it appears in the source data.,visit_detail,cdm
-visit_detail_source_concept_id,No,INTEGER,A foreign key to a Concept that refers to the code used in the source.,visit_detail,cdm
-admitting_source_value,No,VARCHAR(50),The source code for the admitting source as it appears in the source data.,visit_detail,cdm
-admitting_source_concept_id,No,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the admitting source for a visit.,visit_detail,cdm
-discharge_to_source_value,No,VARCHAR(50),The source code for the discharge disposition as it appears in the source data.,visit_detail,cdm
-discharge_to_concept_id,No,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the discharge disposition for a visit.,visit_detail,cdm
-preceding_visit_detail_id,No,INTEGER,A foreign key to the VISIT_DETAIL table of the visit immediately preceding this visit,visit_detail,cdm
-visit_detail_parent_id,No,INTEGER,A foreign key to the VISIT_DETAIL table record to represent the immediate parent visit-detail record.,visit_detail,cdm
-visit_occurrence_id,Yes,INTEGER,"A foreign key that refers to the record in the VISIT_OCCURRENCE table. This is a required field, because for every visit_detail is a child of visit_occurrence and cannot exist without a corresponding parent record in visit_occurrence.",visit_detail,cdm
-visit_occurrence_id,Yes,INTEGER,A unique identifier for each Person's visit or encounter at a healthcare provider.,visit_occurrence,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person for whom the visit is recorded. The demographic details of that Person are stored in the PERSON table.,visit_occurrence,cdm
-visit_concept_id,Yes,INTEGER,A foreign key that refers to a visit Concept identifier in the Standardized Vocabularies.,visit_occurrence,cdm
-visit_start_date,Yes,DATE,The start date of the visit.,visit_occurrence,cdm
-visit_start_datetime,No,DATETIME,The date and time of the visit started.,visit_occurrence,cdm
-visit_end_date,Yes,DATE,The end date of the visit. If this is a one-day visit the end date should match the start date.,visit_occurrence,cdm
-visit_end_datetime,No,DATETIME,The date and time of the visit end.,visit_occurrence,cdm
-visit_type_concept_id,Yes,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the visit record is derived.,visit_occurrence,cdm
-provider_id,No,INTEGER,A foreign key to the provider in the provider table who was associated with the visit.,visit_occurrence,cdm
-care_site_id,No,INTEGER,A foreign key to the care site in the care site table that was visited.,visit_occurrence,cdm
-visit_source_value,No,VARCHAR(50),The source code for the visit as it appears in the source data.,visit_occurrence,cdm
-visit_source_concept_id,No,INTEGER,A foreign key to a Concept that refers to the code used in the source.,visit_occurrence,cdm
-admitting_source_concept_id,No,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the admitting source for a visit.,visit_occurrence,cdm
-admitting_source_value,No,VARCHAR(50),The source code for the admitting source as it appears in the source data.,visit_occurrence,cdm
-discharge_to_concept_id,No,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the discharge disposition for a visit.,visit_occurrence,cdm
-discharge_to_source_value,No,VARCHAR(50),The source code for the discharge disposition as it appears in the source data.,visit_occurrence,cdm
-preceding_visit_occurrence_id,No,INTEGER,A foreign key to the VISIT_OCCURRENCE table of the visit immediately preceding this visit,visit_occurrence,cdm
-cohort_definition_id,Yes,INTEGER,A foreign key to a record in the COHORT_DEFINITION table containing relevant Cohort Definition information.,cohort,results
-subject_id,Yes,INTEGER,"A foreign key to the subject in the cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.",cohort,results
-cohort_start_date,Yes,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit first match.",cohort,results
-cohort_end_date,Yes,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.",cohort,results
-cohort_definition_id,Yes,INTEGER,A foreign key to a record in the [COHORT_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/COHORT_DEFINITION) table containing relevant Cohort Definition information.,cohort_attribute,results
-subject_id,Yes,INTEGER,"A foreign key to the subject in the Cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.",cohort_attribute,results
-cohort_start_date,Yes,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit first match.",cohort_attribute,results
-cohort_end_date,Yes,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.",cohort_attribute,results
-attribute_definition_id,Yes,INTEGER,A foreign key to a record in the [ATTRIBUTE_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/ATTRIBUTE_DEFINITION) table containing relevant Attribute Definition information.,cohort_attribute,results
-value_as_number,No,FLOAT,The attribute result stored as a number. This is applicable to attributes where the result is expressed as a numeric value.,cohort_attribute,results
-value_as_concept_id,No,INTEGER,The attribute result stored as a Concept ID. This is applicable to attributes where the result is expressed as a categorical value.,cohort_attribute,results
-condition_era_id,Yes,INTEGER,A unique identifier for each Condition Era.,condition_era,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is experiencing the Condition during the Condition Era. The demographic details of that Person are stored in the PERSON table.,condition_era,cdm
-condition_concept_id,Yes,INTEGER,A foreign key that refers to a standard Condition Concept identifier in the Standardized Vocabularies.,condition_era,cdm
-condition_era_start_date,Yes,DATE,The start date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the start date of the very first chronologically recorded instance of the condition.,condition_era,cdm
-condition_era_end_date,Yes,DATE,The end date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the end date of the final continuously recorded instance of the Condition.,condition_era,cdm
-condition_occurrence_count,No,INTEGER,The number of individual Condition Occurrences used to construct the condition era.,condition_era,cdm
-dose_era_id,Yes,INTEGER,A unique identifier for each Dose Era.,dose_era,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is subjected to the drug during the drug era. The demographic details of that Person are stored in the PERSON table.,dose_era,cdm
-drug_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the active Ingredient Concept.,dose_era,cdm
-unit_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the unit concept.,dose_era,cdm
-dose_value,Yes,FLOAT,The numeric value of the dose.,dose_era,cdm
-dose_era_start_date,Yes,DATE,The start date for the drug era constructed from the individual instances of drug exposures. It is the start date of the very first chronologically recorded instance of utilization of a drug.,dose_era,cdm
-dose_era_end_date,Yes,DATE,The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.,dose_era,cdm
-drug_era_id,Yes,INTEGER,A unique identifier for each Drug Era.,drug_era,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is subjected to the Drug during the fDrug Era. The demographic details of that Person are stored in the PERSON table.,drug_era,cdm
-drug_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Ingredient Concept.,drug_era,cdm
-drug_era_start_date,Yes,DATE,The start date for the Drug Era constructed from the individual instances of Drug Exposures. It is the start date of the very first chronologically recorded instance of conutilization of a Drug.,drug_era,cdm
-drug_era_end_date,Yes,DATE,The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.,drug_era,cdm
-drug_exposure_count,No,INTEGER,The number of individual Drug Exposure occurrences used to construct the Drug Era.,drug_era,cdm
-gap_days,No,INTEGER,The number of days that are not covered by DRUG_EXPOSURE records that were used to make up the era record.,drug_era,cdm
-cost_id,Yes,INTEGER,A unique identifier for each COST record.,cost,cdm
-cost_event_id,Yes,INTEGER,"A foreign key identifier to the event (e.g. Measurement, Procedure, Visit, Drug Exposure, etc) record for which cost data are recorded.",cost,cdm
-cost_domain_id,Yes,VARCHAR(20),"The concept representing the domain of the cost event, from which the corresponding table can be inferred that contains the entity for which cost information is recorded.",cost,cdm
-cost_type_concept_id,Yes,INTEGER,"A foreign key identifier to a concept in the CONCEPT table for the provenance or the source of the COST data: Calculated from insurance claim information, provider revenue, calculated from cost-to-charge ratio, reported from accounting database, etc.",cost,cdm
-currency_concept_id,No,INTEGER,"A foreign key identifier to the concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.",cost,cdm
-total_charge,No,FLOAT,"The total amount charged by some provider of goods or services (e.g. hospital, physician pharmacy, dme provider) to payers (insurance companies, the patient).",cost,cdm
-total_cost,No,FLOAT,The cost incurred by the provider of goods or services.,cost,cdm
-total_paid,No,FLOAT,The total amount actually paid from all payers for goods or services of the provider.,cost,cdm
-paid_by_payer,No,FLOAT,The amount paid by the Payer for the goods or services.,cost,cdm
-paid_by_patient,No,FLOAT,The total amount paid by the Person as a share of the expenses.,cost,cdm
-paid_patient_copay,No,FLOAT,The amount paid by the Person as a fixed contribution to the expenses.,cost,cdm
-paid_patient_coinsurance,No,FLOAT,"The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the Payer Plan after the Person's deductible is exceeded.",cost,cdm
-paid_patient_deductible,No,FLOAT,The amount paid by the Person that is counted toward the deductible defined by the Payer Plan. paid_patient_deductible does contribute to the paid_by_patient variable.,cost,cdm
-paid_by_primary,No,FLOAT,The amount paid by a primary Payer through the coordination of benefits.,cost,cdm
-paid_ingredient_cost,No,FLOAT,"The amount paid by the Payer to a pharmacy for the drug, excluding the amount paid for dispensing the drug.  paid_ingredient_cost contributes to the paid_by_payer field if this field is populated with a nonzero value.",cost,cdm
-paid_dispensing_fee,No,FLOAT,"The amount paid by the Payer to a pharmacy for dispensing a drug, excluding the amount paid for the drug ingredient. paid_dispensing_fee contributes to the paid_by_payer field if this field is populated with a nonzero value.",cost,cdm
-payer_plan_period_id,No,INTEGER,"A foreign key to the PAYER_PLAN_PERIOD table, where the details of the Payer, Plan and Family are stored.  Record the payer_plan_id that relates to the payer who contributed to the paid_by_payer field.",cost,cdm
-amount_allowed,No,FLOAT,The contracted amount agreed between the payer and provider.,cost,cdm
-revenue_code_concept_id,No,INTEGER,A foreign key referring to a Standard Concept ID in the Standardized Vocabularies for Revenue codes.,cost,cdm
-revenue_code_source_value,No,VARCHAR(50),"The source code for the Revenue code as it appears in the source data, stored here for reference.",cost,cdm
-drg_concept_id,No,INTEGER,A foreign key to the predefined concept in the DRG Vocabulary reflecting the DRG for a visit.,cost,cdm
-drg_source_value,No,VARCHAR(3),The 3-digit DRG source code as it appears in the source data.,cost,cdm
-payer_plan_period_id,Yes,INTEGER,"A identifier for each unique combination of payer, sponsor, plan, family code and time span.",payer_plan_period,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person covered by the payer. The demographic details of that Person are stored in the PERSON table.,payer_plan_period,cdm
-payer_plan_period_start_date,Yes,DATE,The start date of the payer plan period.,payer_plan_period,cdm
-payer_plan_period_end_date,Yes,DATE,The end date of the payer plan period.,payer_plan_period,cdm
-payer_concept_id,No,INTEGER,A foreign key that refers to a Standard Payer concept identifiers in the Standardized Vocabularies,payer_plan_period,cdm
-payer_source_value,No,VARCHAR(50),The source code for the payer as it appears in the source data.,payer_plan_period,cdm
-payer_source_concept_id,No,INTEGER,A foreign key to a payer concept that refers to the code used in the source.,payer_plan_period,cdm
-plan_concept_id,No,INTEGER,A foreign key that refers to a Standard plan that represents the health benefit plan in the Standardized Vocabularies,payer_plan_period,cdm
-plan_source_value,No,VARCHAR(50),The source code for the Person's health benefit plan as it appears in the source data.,payer_plan_period,cdm
-plan_source_concept_id,No,INTEGER,A foreign key to a plan concept that refers to the code used in the source.,payer_plan_period,cdm
-sponsor_concept_id,No,INTEGER,A foreign key that refers to a Standard plan that represents the sponsor in the Standardized Vocabularies,payer_plan_period,cdm
-sponsor_source_value,No,VARCHAR(50),The source code for the Person's sponsor of the health plan as it appears in the source data.,payer_plan_period,cdm
-sponsor_source_concept_id,No,INTEGER,A foreign key to a sponsor concept that refers to the code used in the source.,payer_plan_period,cdm
-family_source_value,No,VARCHAR(50),The source code for the Person's family as it appears in the source data.,payer_plan_period,cdm
-stop_reason_concept_id,No,INTEGER,A foreign key that refers to a Standard termination reason that represents the reason for the termination in the Standardized Vocabularies.,payer_plan_period,cdm
-stop_reason_source_value,No,VARCHAR(50),The reason for stop-coverage of the record.,payer_plan_period,cdm
-stop_reason_source_concept_id,No,INTEGER,A foreign key to a stop-coverage concept that refers to the code used in the source.,payer_plan_period,cdm
-care_site_id,Yes,INTEGER,A unique identifier for each Care Site.,care_site,cdm
-care_site_name,No,VARCHAR(255),The verbatim description or name of the Care Site as in data source,care_site,cdm
-place_of_service_concept_id,No,INTEGER,A foreign key that refers to a Place of Service Concept ID in the Standardized Vocabularies.,care_site,cdm
-location_id,No,INTEGER,"A foreign key to the geographic Location in the LOCATION table, where the detailed address information is stored.",care_site,cdm
-care_site_source_value,No,VARCHAR(50),"The identifier for the Care Site in the source data, stored here for reference.",care_site,cdm
-place_of_service_source_value,No,VARCHAR(50),"The source code for the Place of Service as it appears in the source data, stored here for reference.",care_site,cdm
-location_id,Yes,INTEGER,A unique identifier for each geographic location.,location,cdm
-address_1,No,VARCHAR(50),"The address field 1, typically used for the street address, as it appears in the source data.",location,cdm
-address_2,No,VARCHAR(50),"The address field 2, typically used for additional detail such as buildings, suites, floors, as it appears in the source data.",location,cdm
-city,No,VARCHAR(50),The city field as it appears in the source data.,location,cdm
-state,No,VARCHAR(2),The state field as it appears in the source data.,location,cdm
-zip,No,VARCHAR(9),The zip or postal code.,location,cdm
-county,No,VARCHAR(20),The county.,location,cdm
-location_source_value,No,VARCHAR(50),The verbatim information that is used to uniquely identify the location as it appears in the source data.,location,cdm
-provider_id,Yes,INTEGER,A unique identifier for each Provider.,provider,cdm
-provider_name,No,VARCHAR(255),A description of the Provider.,provider,cdm
-npi,No,VARCHAR(20),The National Provider Identifier (NPI) of the provider.,provider,cdm
-dea,No,VARCHAR(20),The Drug Enforcement Administration (DEA) number of the provider.,provider,cdm
-specialty_concept_id,No,INTEGER,A foreign key to a Standard Specialty Concept ID in the Standardized Vocabularies.,provider,cdm
-care_site_id,No,INTEGER,A foreign key to the main Care Site where the provider is practicing.,provider,cdm
-year_of_birth,No,INTEGER,The year of birth of the Provider.,provider,cdm
-gender_concept_id,No,INTEGER,The gender of the Provider.,provider,cdm
-provider_source_value,No,VARCHAR(50),"The identifier used for the Provider in the source data, stored here for reference.",provider,cdm
-specialty_source_value,No,VARCHAR(50),"The source code for the Provider specialty as it appears in the source data, stored here for reference.",provider,cdm
-specialty_source_concept_id,No,INTEGER,A foreign key to a Concept that refers to the code used in the source.,provider,cdm
-gender_source_value,No,VARCHAR(50),"The gender code for the Provider as it appears in the source data, stored here for reference.",provider,cdm
-gender_source_concept_id,No,INTEGER,A foreign key to a Concept that refers to the code used in the source.,provider,cdm
-cdm_source_name,Yes,VARCHAR(255),The full name of the source,cdm_source,cdm
-cdm_source_abbreviation,No,VARCHAR(25),An abbreviation of the name,cdm_source,cdm
-cdm_holder,No,VARCHAR(255),The name of the organization responsible for the development of the CDM instance,cdm_source,cdm
-source_description,No,CLOB,A description of the source data origin and purpose for collection. The description may contain a summary of the period of time that is expected to be covered by this dataset.,cdm_source,cdm
-source_documentation_reference,No,VARCHAR(255),URL or other external reference to location of source documentation,cdm_source,cdm
-cdm_etl_reference,No,VARCHAR(255),URL or other external reference to location of ETL specification documentation and ETL source code,cdm_source,cdm
-source_release_date,No,DATE,"The date for which the source data are most current, such as the last day of data capture",cdm_source,cdm
-cdm_release_date,No,DATE,The date when the CDM was instantiated,cdm_source,cdm
-cdm_version,No,VARCHAR(10),The version of CDM used,cdm_source,cdm
-vocabulary_version,No,VARCHAR(20),The version of the vocabulary used,cdm_source,cdm
-metadata_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Metadata Concept identifier in the Standardized Vocabularies.,metadata,cdm
-metadata_type_concept_id,Yes,INTEGER,A foreign key that refers to a Standard Type Concept identifier in the Standardized Vocabularies.,metadata,cdm
-name,Yes,VARCHAR(250),The name of the Concept stored in metadata_concept_id or a description of the data being stored.,metadata,cdm
-value_as_string,No,NVARCHAR,The metadata value stored as a string.,metadata,cdm
-value_as_concept_id,No,INTEGER,A foreign key to a metadata value stored as a Concept ID.,metadata,cdm
-metadata date,No,DATE,The date associated with the metadata,metadata,cdm
-metadata_datetime,No,DATETIME,The date and time associated with the metadata,metadata,cdm
-attribute_definition_id,Yes,INTEGER,A unique identifier for each Attribute.,attribute_definition,cdm
-attribute_name,Yes,VARCHAR(255),A short description of the Attribute.,attribute_definition,cdm
-attribute_description,No,VARCHAR(MAX),A complete description of the Attribute definition,attribute_definition,cdm
-attribute_type_concept_id,Yes,INTEGER,Type defining what kind of Attribute Definition the record represents and how the syntax may be executed,attribute_definition,cdm
-attribute_syntax,No,VARCHAR(MAX),Syntax or code to operationalize the Attribute definition,attribute_definition,cdm
-cohort_definition_id,Yes,INTEGER,A unique identifier for each Cohort.,cohort_definition,cdm
-cohort_definition_name,Yes,VARCHAR(255),A short description of the Cohort.,cohort_definition,cdm
-cohort_definition_description,No,VARCHAR(MAX),A complete description of the Cohort definition,cohort_definition,cdm
-definition_type_concept_id,Yes,INTEGER,Type defining what kind of Cohort Definition the record represents and how the syntax may be executed,cohort_definition,cdm
-cohort_definition_syntax,No,VARCHAR(MAX),Syntax or code to operationalize the Cohort definition,cohort_definition,cdm
-subject_concept_id,Yes,INTEGER,"A foreign key to the Concept to which defines the domain of subjects that are members of the cohort (e.g., Person, Provider, Visit).",cohort_definition,cdm
-cohort_initiation_date,No,DATE,A date to indicate when the Cohort was initiated in the COHORT table,cohort_definition,cdm
-episode_id,Yes,INTEGER,A unique identifier for each Episode,episode,cdm
-person_id,Yes,INTEGER,A foreign key identifier to the Person who is undergoing the Episode. The demographic details of that Person are stored in the PERSON table.,episode,cdm
-episode_concept_id,Yes,INTEGER,"A foreign key that refers to a standard Episode Concept identifier in the Standardized Vocabularies. Examples of an Episode Concept can be: Treatment Regimen, Treatment Cycle, Disease First Occurrence, Remission, Relapse, Episode of Care",episode,cdm
-episode_start_datetime,Yes,DATE,The date and time on which the Episode was started.,episode,cdm
-episode_end_datetime,No,DATE,The date and time on which the Episode was ended.,episode,cdm
-episode_parent_id,No,INTEGER,A foreign key that refers to a parent Episode entry representing an entire episode if the episode spans multiple cycles.,episode,cdm
-episode_number,No,INTEGER,An ordinal count for an Episode that spans multiple times,episode,cdm
-episode_object_concept_id,Yes,INTEGER,"	A foreign key that refers to a concept identifier in the Standardized Vocabularies describing the disease, treatment, or other abstraction that the episode describes. Episode entries from the 'Disease Episode' concept class should have an episode_object_concept_id that comes from the Condition domain. Episode entries from the 'Treatment Episode' concept class should have an episode_object_concept_id that comes from the 'Procedure' or 'Regimen' domain.",episode,cdm
-episode_type_concept_id,Yes,INTEGER,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the Episode was recorded, the level of standardization, and the type of occurrence. These belong to the 'Episode Type' vocabulary.",episode,cdm
-episode_source_value,No,VARCHAR(50),"The source code for the Episode as it appears in the source data. This code is mapped to a standard episode Concept in the Standardized Vocabularies and the original code is, stored here for reference.",episode,cdm
-episode_source_concept_id,No,INTEGER,A foreign key to a Episode Concept that refers to the code used in the source.,episode,cdm
-episode_id,Yes,INTEGER,A foreign key identifier to the Episode that the Episode Event belongs to,episode_event,cdm
-event_id,Yes,INTEGER,"	A foreign key identifier to the underlying event (condition, procedure, measurement, etc.) record in a respective table for which an episode is recorded.",episode_event,cdm
-event_field_concept_id,No,INTEGER,"A foreign key identifier to the standardized concept corresponding to the table primary key column (condition_occurrence.condition_occurrence_id, procedure_occurrence.procedure_occurrence_id, measurement.measurement_id etc.) where the underlying event is stored.",episode_event,cdm
\ No newline at end of file
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.3.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.4.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.4.csv
new file mode 100644
index 00000000..674e837c
--- /dev/null
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.4.csv
@@ -0,0 +1,384 @@
+table,field,required,type,description,schema
+PERSON,person_id,Yes,INTEGER,It is assumed that every person with a different unique identifier is in fact a different person and should be treated independently.,cdm
+PERSON,gender_concept_id,Yes,INTEGER,This field is meant to capture the biological sex at birth of the Person. This field should not be used to study gender identity issues.,cdm
+PERSON,year_of_birth,Yes,INTEGER,Compute age using year_of_birth.,cdm
+PERSON,month_of_birth,No,INTEGER,,cdm
+PERSON,day_of_birth,No,INTEGER,,cdm
+PERSON,birth_datetime,No,DATETIME,,cdm
+PERSON,race_concept_id,Yes,INTEGER,This field captures race or ethnic background of the person.,cdm
+PERSON,ethnicity_concept_id,Yes,INTEGER,"This field captures Ethnicity as defined by the Office of Management and Budget (OMB) of the US Government: it distinguishes only between ""Hispanic"" and ""Not Hispanic"". Races and ethnic backgrounds are not stored here.",cdm
+PERSON,location_id,No,INTEGER,The location refers to the physical address of the person. This field should capture the last known location of the person. ,cdm
+PERSON,provider_id,No,INTEGER,The Provider refers to the last known primary care provider (General Practitioner).,cdm
+PERSON,care_site_id,No,INTEGER,The Care Site refers to where the Provider typically provides the primary care.,cdm
+PERSON,person_source_value,No,CHARACTER VARYING,Use this field to link back to persons in the source data. This is typically used for error checking of ETL logic.,cdm
+PERSON,gender_source_value,No,CHARACTER VARYING,This field is used to store the biological sex of the person from the source data. It is not intended for use in standard analytics but for reference only.,cdm
+PERSON,gender_source_concept_id,No,INTEGER,"Due to the small number of options, this tends to be zero.",cdm
+PERSON,race_source_value,No,CHARACTER VARYING,This field is used to store the race of the person from the source data. It is not intended for use in standard analytics but for reference only.,cdm
+PERSON,race_source_concept_id,No,INTEGER,"Due to the small number of options, this tends to be zero.",cdm
+PERSON,ethnicity_source_value,No,CHARACTER VARYING,This field is used to store the ethnicity of the person from the source data. It is not intended for use in standard analytics but for reference only.,cdm
+PERSON,ethnicity_source_concept_id,No,INTEGER,"Due to the small number of options, this tends to be zero.",cdm
+OBSERVATION_PERIOD,observation_period_id,Yes,INTEGER,A Person can have multiple discrete Observation Periods which are identified by the Observation_Period_Id.,cdm
+OBSERVATION_PERIOD,person_id,Yes,INTEGER,The Person ID of the PERSON record for which the Observation Period is recorded.,cdm
+OBSERVATION_PERIOD,observation_period_start_date,Yes,DATE,Use this date to determine the start date of the Observation Period.,cdm
+OBSERVATION_PERIOD,observation_period_end_date,Yes,DATE,Use this date to determine the end date of the period for which we can assume that all events for a Person are recorded.,cdm
+OBSERVATION_PERIOD,period_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Observation Period as in whether the period was determined from an insurance enrollment file, EHR healthcare encounters, or other sources.",cdm
+VISIT_OCCURRENCE,visit_occurrence_id,Yes,INTEGER,Use this to identify unique interactions between a person and the health care system. This identifier links across the other CDM event tables to associate events with a visit.,cdm
+VISIT_OCCURRENCE,person_id,Yes,INTEGER,,cdm
+VISIT_OCCURRENCE,visit_concept_id,Yes,INTEGER,"This field contains a concept id representing the kind of visit, like inpatient or outpatient. All concepts in this field should be standard and belong to the Visit domain.",cdm
+VISIT_OCCURRENCE,visit_start_date,Yes,DATE,"For inpatient visits, the start date is typically the admission date. For outpatient visits the start date and end date will be the same.",cdm
+VISIT_OCCURRENCE,visit_start_datetime,No,DATETIME,,cdm
+VISIT_OCCURRENCE,visit_end_date,Yes,DATE,"For inpatient visits the end date is typically the discharge date.  If a Person is still an inpatient in the hospital at the time of the data extract and does not have a visit_end_date, then set the visit_end_date to the date of the data pull.",cdm
+VISIT_OCCURRENCE,visit_end_datetime,No,DATETIME,"If a Person is still an inpatient in the hospital at the time of the data extract and does not have a visit_end_datetime, then set the visit_end_datetime to the datetime of the data pull.",cdm
+VISIT_OCCURRENCE,visit_type_concept_id,Yes,INTEGER,"Use this field to understand the provenance of the visit record, or where the record comes from.",cdm
+VISIT_OCCURRENCE,provider_id,No,INTEGER,"There will only be one provider per visit record and the ETL document should clearly state how they were chosen (attending, admitting, etc.). If there are multiple providers associated with a visit in the source, this can be reflected in the event tables (CONDITION_OCCURRENCE, PROCEDURE_OCCURRENCE, etc.) or in the VISIT_DETAIL table.",cdm
+VISIT_OCCURRENCE,care_site_id,No,INTEGER,This field provides information about the Care Site where the Visit took place.,cdm
+VISIT_OCCURRENCE,visit_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the kind of visit that took place (inpatient, outpatient, emergency, etc.)",cdm
+VISIT_OCCURRENCE,visit_source_concept_id,No,INTEGER,,cdm
+VISIT_OCCURRENCE,admitted_from_concept_id,No,INTEGER,"Use this field to determine where the patient was admitted from. This concept is part of the visit domain and can indicate if a patient was admitted to the hospital from a long-term care facility, for example.",cdm
+VISIT_OCCURRENCE,admitted_from_source_value,No,CHARACTER VARYING,,cdm
+VISIT_OCCURRENCE,discharged_to_concept_id,No,INTEGER,"Use this field to determine where the patient was discharged to after a visit. This concept is part of the visit domain and can indicate if a patient was transferred to another hospital or sent to a long-term care facility, for example.  It is assumed that a person is discharged to home therefore there is not a standard concept id for ""home"".  Use concept id = 0 when a person is discharged to home.",cdm
+VISIT_OCCURRENCE,discharged_to_source_value,No,CHARACTER VARYING,,cdm
+VISIT_OCCURRENCE,preceding_visit_occurrence_id,No,INTEGER,Use this field to find the visit that occurred for the person prior to the given visit. There could be a few days or a few years in between.,cdm
+VISIT_DETAIL,visit_detail_id,Yes,INTEGER,Use this to identify unique interactions between a person and the health care system. This identifier links across the other CDM event tables to associate events with a visit detail.,cdm
+VISIT_DETAIL,person_id,Yes,INTEGER,,cdm
+VISIT_DETAIL,visit_detail_concept_id,Yes,INTEGER,"This field contains a concept id representing the kind of visit detail, like inpatient or outpatient. All concepts in this field should be standard and belong to the Visit domain.",cdm
+VISIT_DETAIL,visit_detail_start_date,Yes,DATE,This is the date of the start of the encounter. This may or may not be equal to the date of the Visit the Visit Detail is associated with.,cdm
+VISIT_DETAIL,visit_detail_start_datetime,No,DATETIME,,cdm
+VISIT_DETAIL,visit_detail_end_date,Yes,DATE,"This the end date of the patient-provider interaction.  If a Person is still an inpatient in the hospital at the time of the data extract and does not have a visit_end_date, then set the visit_end_date to the date of the data pull.",cdm
+VISIT_DETAIL,visit_detail_end_datetime,No,DATETIME,"If a Person is still an inpatient in the hospital at the time of the data extract and does not have a visit_end_datetime, then set the visit_end_datetime to the datetime of the data pull.",cdm
+VISIT_DETAIL,visit_detail_type_concept_id,Yes,INTEGER,"Use this field to understand the provenance of the visit detail record, or where the record comes from.",cdm
+VISIT_DETAIL,provider_id,No,INTEGER,"There will only be one provider per  **visit** record and the ETL document should clearly state how they were chosen (attending, admitting, etc.). This is a typical reason for leveraging the VISIT_DETAIL table as even though each VISIT_DETAIL record can only have one provider, there is no limit to the number of VISIT_DETAIL records that can be associated to a VISIT_OCCURRENCE record.",cdm
+VISIT_DETAIL,care_site_id,No,INTEGER,This field provides information about the Care Site where the Visit Detail took place.,cdm
+VISIT_DETAIL,visit_detail_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the kind of visit detail that took place (inpatient, outpatient, emergency, etc.)",cdm
+VISIT_DETAIL,visit_detail_source_concept_id,No,INTEGER,,cdm
+VISIT_DETAIL,admitted_from_concept_id,No,INTEGER,"Use this field to determine where the patient was admitted from. This concept is part of the visit domain and can indicate if a patient was admitted to the hospital from a long-term care facility, for example.",cdm
+VISIT_DETAIL,admitted_from_source_value,No,CHARACTER VARYING,,cdm
+VISIT_DETAIL,discharged_to_source_value,No,CHARACTER VARYING,,cdm
+VISIT_DETAIL,discharged_to_concept_id,No,INTEGER,"Use this field to determine where the patient was discharged to after a visit. This concept is part of the visit domain and can indicate if a patient was transferred to another hospital or sent to a long-term care facility, for example.  It is assumed that a person is discharged to home therefore there is not a standard concept id for ""home"".  Use concept id = 0 when a person is discharged to home.",cdm
+VISIT_DETAIL,preceding_visit_detail_id,No,INTEGER,Use this field to find the visit detail that occurred for the person prior to the given visit detail record. There could be a few days or a few years in between.,cdm
+VISIT_DETAIL,parent_visit_detail_id,No,INTEGER,Use this field to find the visit detail that subsumes the given visit detail record. This is used in the case that a visit detail record needs to be nested beyond the VISIT_OCCURRENCE/VISIT_DETAIL relationship.,cdm
+VISIT_DETAIL,visit_occurrence_id,Yes,INTEGER,Use this field to link the VISIT_DETAIL record to its VISIT_OCCURRENCE.,cdm
+CONDITION_OCCURRENCE,condition_occurrence_id,Yes,INTEGER,The unique key given to a condition record for a person. Refer to the ETL for how duplicate conditions during the same visit were handled.,cdm
+CONDITION_OCCURRENCE,person_id,Yes,INTEGER,The PERSON_ID of the PERSON for whom the condition is recorded.,cdm
+CONDITION_OCCURRENCE,condition_concept_id,Yes,INTEGER,"The CONDITION_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source value which represents a condition",cdm
+CONDITION_OCCURRENCE,condition_start_date,Yes,DATE,Use this date to determine the start date of the condition,cdm
+CONDITION_OCCURRENCE,condition_start_datetime,No,DATETIME,,cdm
+CONDITION_OCCURRENCE,condition_end_date,No,DATE,Use this date to determine the end date of the condition,cdm
+CONDITION_OCCURRENCE,condition_end_datetime,No,DATETIME,,cdm
+CONDITION_OCCURRENCE,condition_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Condition record, as in whether the condition was from an EHR system, insurance claim, registry, or other sources.",cdm
+CONDITION_OCCURRENCE,condition_status_concept_id,No,INTEGER,"This concept represents the point during the visit the diagnosis was given (admitting diagnosis, final diagnosis), whether the diagnosis was determined due to laboratory findings, if the diagnosis was exclusionary, or if it was a preliminary diagnosis, among others. ",cdm
+CONDITION_OCCURRENCE,stop_reason,No,CHARACTER VARYING,The Stop Reason indicates why a Condition is no longer valid with respect to the purpose within the source data. Note that a Stop Reason does not necessarily imply that the condition is no longer occurring.,cdm
+CONDITION_OCCURRENCE,provider_id,No,INTEGER,"The provider associated with condition record, e.g. the provider who made the diagnosis or the provider who recorded the symptom.",cdm
+CONDITION_OCCURRENCE,visit_occurrence_id,No,INTEGER,The visit during which the condition occurred.,cdm
+CONDITION_OCCURRENCE,visit_detail_id,No,INTEGER,"The VISIT_DETAIL record during which the condition occurred. For example, if the person was in the ICU at the time of the diagnosis the VISIT_OCCURRENCE record would reflect the overall hospital stay and the VISIT_DETAIL record would reflect the ICU stay during the hospital visit.",cdm
+CONDITION_OCCURRENCE,condition_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the condition that occurred. For example, this could be an ICD10 or Read code.",cdm
+CONDITION_OCCURRENCE,condition_source_concept_id,No,INTEGER,"This is the concept representing the condition source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Condition necessary for a given analytic use case. Consider using CONDITION_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+CONDITION_OCCURRENCE,condition_status_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the condition status.,cdm
+DRUG_EXPOSURE,drug_exposure_id,Yes,INTEGER,The unique key given to records of drug dispensings or administrations for a person. Refer to the ETL for how duplicate drugs during the same visit were handled.,cdm
+DRUG_EXPOSURE,person_id,Yes,INTEGER,The PERSON_ID of the PERSON for whom the drug dispensing or administration is recorded. This may be a system generated code.,cdm
+DRUG_EXPOSURE,drug_concept_id,Yes,INTEGER,"The DRUG_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source concept id which represents a drug product or molecule otherwise introduced to the body. The drug concepts can have a varying degree of information about drug strength and dose. This information is relevant in the context of quantity and administration information in the subsequent fields plus strength information from the DRUG_STRENGTH table, provided as part of the standard vocabulary download.",cdm
+DRUG_EXPOSURE,drug_exposure_start_date,Yes,DATE,Use this date to determine the start date of the drug record.,cdm
+DRUG_EXPOSURE,drug_exposure_start_datetime,No,DATETIME,,cdm
+DRUG_EXPOSURE,drug_exposure_end_date,Yes,DATE,The DRUG_EXPOSURE_END_DATE denotes the day the drug exposure ended for the patient.,cdm
+DRUG_EXPOSURE,drug_exposure_end_datetime,No,DATETIME,,cdm
+DRUG_EXPOSURE,verbatim_end_date,No,DATE,"This is the end date of the drug exposure as it appears in the source data, if it is given",cdm
+DRUG_EXPOSURE,drug_type_concept_id,Yes,INTEGER,"You can use the TYPE_CONCEPT_ID to delineate between prescriptions written vs. prescriptions dispensed vs. medication history vs. patient-reported exposure, etc.",cdm
+DRUG_EXPOSURE,stop_reason,No,CHARACTER VARYING,"The reason a person stopped a medication as it is represented in the source. Reasons include regimen completed, changed, removed, etc. This field will be retired in v6.0.",cdm
+DRUG_EXPOSURE,refills,No,INTEGER,This is only filled in when the record is coming from a prescription written this field is meant to represent intended refills at time of the prescription.,cdm
+DRUG_EXPOSURE,quantity,No,FLOAT,,cdm
+DRUG_EXPOSURE,days_supply,No,INTEGER,,cdm
+DRUG_EXPOSURE,sig,No,CHARACTER VARYING,This is the verbatim instruction for the drug as written by the provider.,cdm
+DRUG_EXPOSURE,route_concept_id,No,INTEGER,,cdm
+DRUG_EXPOSURE,lot_number,No,CHARACTER VARYING,,cdm
+DRUG_EXPOSURE,provider_id,No,INTEGER,"The Provider associated with drug record, e.g. the provider who wrote the prescription or the provider who administered the drug.",cdm
+DRUG_EXPOSURE,visit_occurrence_id,No,INTEGER,"The Visit during which the drug was prescribed, administered or dispensed.",cdm
+DRUG_EXPOSURE,visit_detail_id,No,INTEGER,"The VISIT_DETAIL record during which the drug exposure occurred. For example, if the person was in the ICU at the time of the drug administration the VISIT_OCCURRENCE record would reflect the overall hospital stay and the VISIT_DETAIL record would reflect the ICU stay during the hospital visit.",cdm
+DRUG_EXPOSURE,drug_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the drug exposure that occurred. For example, this could be an NDC or Gemscript code.",cdm
+DRUG_EXPOSURE,drug_source_concept_id,No,INTEGER,"This is the concept representing the drug source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Drug necessary for a given analytic use case. Consider using DRUG_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+DRUG_EXPOSURE,route_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the drug route.,cdm
+DRUG_EXPOSURE,dose_unit_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the dose unit of the drug given.,cdm
+PROCEDURE_OCCURRENCE,procedure_occurrence_id,Yes,INTEGER,The unique key given to a procedure record for a person. Refer to the ETL for how duplicate procedures during the same visit were handled.,cdm
+PROCEDURE_OCCURRENCE,person_id,Yes,INTEGER,The PERSON_ID of the PERSON for whom the procedure is recorded. This may be a system generated code.,cdm
+PROCEDURE_OCCURRENCE,procedure_concept_id,Yes,INTEGER,"The PROCEDURE_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source value which represents a procedure",cdm
+PROCEDURE_OCCURRENCE,procedure_date,Yes,DATE,Use this date to determine the date the procedure started.,cdm
+PROCEDURE_OCCURRENCE,procedure_datetime,No,DATETIME,,cdm
+PROCEDURE_OCCURRENCE,procedure_end_date,No,DATE,Use this field to house the date that the procedure ended. ,cdm
+PROCEDURE_OCCURRENCE,procedure_end_datetime,No,DATETIME,Use this field to house the datetime that the procedure ended. ,cdm
+PROCEDURE_OCCURRENCE,procedure_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Procedure record, as in whether the procedure was from an EHR system, insurance claim, registry, or other sources.",cdm
+PROCEDURE_OCCURRENCE,modifier_concept_id,No,INTEGER,The modifiers are intended to give additional information about the procedure but as of now the vocabulary is under review.,cdm
+PROCEDURE_OCCURRENCE,quantity,No,INTEGER,"If the quantity value is omitted, a single procedure is assumed.",cdm
+PROCEDURE_OCCURRENCE,provider_id,No,INTEGER,"The provider associated with the procedure record, e.g. the provider who performed the Procedure.",cdm
+PROCEDURE_OCCURRENCE,visit_occurrence_id,No,INTEGER,The visit during which the procedure occurred.,cdm
+PROCEDURE_OCCURRENCE,visit_detail_id,No,INTEGER,"The VISIT_DETAIL record during which the Procedure occurred. For example, if the Person was in the ICU at the time of the Procedure the VISIT_OCCURRENCE record would reflect the overall hospital stay and the VISIT_DETAIL record would reflect the ICU stay during the hospital visit.",cdm
+PROCEDURE_OCCURRENCE,procedure_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the procedure that occurred. For example, this could be an CPT4 or OPCS4 code.",cdm
+PROCEDURE_OCCURRENCE,procedure_source_concept_id,No,INTEGER,"This is the concept representing the procedure source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Procedure necessary for a given analytic use case. Consider using PROCEDURE_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+PROCEDURE_OCCURRENCE,modifier_source_value,No,CHARACTER VARYING,,cdm
+DEVICE_EXPOSURE,device_exposure_id,Yes,INTEGER,The unique key given to records a person's exposure to a foreign physical object or instrument.,cdm
+DEVICE_EXPOSURE,person_id,Yes,INTEGER,,cdm
+DEVICE_EXPOSURE,device_concept_id,Yes,INTEGER,"The DEVICE_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source concept id which represents a foreign object or instrument the person was exposed to. ",cdm
+DEVICE_EXPOSURE,device_exposure_start_date,Yes,DATE,Use this date to determine the start date of the device record.,cdm
+DEVICE_EXPOSURE,device_exposure_start_datetime,No,DATETIME,,cdm
+DEVICE_EXPOSURE,device_exposure_end_date,No,DATE,"The DEVICE_EXPOSURE_END_DATE denotes the day the device exposure ended for the patient, if given.",cdm
+DEVICE_EXPOSURE,device_exposure_end_datetime,No,DATETIME,,cdm
+DEVICE_EXPOSURE,device_type_concept_id,Yes,INTEGER,"You can use the TYPE_CONCEPT_ID to denote the provenance of the record, as in whether the record is from administrative claims or EHR. ",cdm
+DEVICE_EXPOSURE,unique_device_id,No,CHARACTER VARYING,"This is the Unique Device Identification (UDI-DI) number for devices regulated by the FDA, if given. ",cdm
+DEVICE_EXPOSURE,production_id,No,CHARACTER VARYING,This is the Production Identifier (UDI-PI) portion of the Unique Device Identification.,cdm
+DEVICE_EXPOSURE,quantity,No,INTEGER,,cdm
+DEVICE_EXPOSURE,provider_id,No,INTEGER,"The Provider associated with device record, e.g. the provider who wrote the prescription or the provider who implanted the device.",cdm
+DEVICE_EXPOSURE,visit_occurrence_id,No,INTEGER,The Visit during which the device was prescribed or given.,cdm
+DEVICE_EXPOSURE,visit_detail_id,No,INTEGER,The Visit Detail during which the device was prescribed or given.,cdm
+DEVICE_EXPOSURE,device_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the device exposure that occurred. For example, this could be an NDC or Gemscript code.",cdm
+DEVICE_EXPOSURE,device_source_concept_id,No,INTEGER,"This is the concept representing the device source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Device necessary for a given analytic use case. Consider using DEVICE_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+DEVICE_EXPOSURE,unit_concept_id,No,INTEGER,UNIT_SOURCE_VALUES should be mapped to a Standard Concept in the Unit domain that best represents the unit as given in the source data. ,cdm
+DEVICE_EXPOSURE,unit_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the unit of the Device. For example, blood transfusions are considered devices and can be given in mL quantities. ",cdm
+DEVICE_EXPOSURE,unit_source_concept_id,No,INTEGER,"This is the concept representing the UNIT_SOURCE_VALUE and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Unit necessary for a given analytic use case. Consider using UNIT_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+MEASUREMENT,measurement_id,Yes,INTEGER,The unique key given to a Measurement record for a Person. Refer to the ETL for how duplicate Measurements during the same Visit were handled.,cdm
+MEASUREMENT,person_id,Yes,INTEGER,The PERSON_ID of the Person for whom the Measurement is recorded. This may be a system generated code.,cdm
+MEASUREMENT,measurement_concept_id,Yes,INTEGER,"The MEASUREMENT_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies.",cdm
+MEASUREMENT,measurement_date,Yes,DATE,Use this date to determine the date of the measurement.,cdm
+MEASUREMENT,measurement_datetime,No,DATETIME,,cdm
+MEASUREMENT,measurement_time,No,CHARACTER VARYING,,cdm
+MEASUREMENT,measurement_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Measurement record, as in whether the measurement was from an EHR system, insurance claim, registry, or other sources.",cdm
+MEASUREMENT,operator_concept_id,No,INTEGER,"The meaning of Concept [4172703](https://athena.ohdsi.org/search-terms/terms/4172703) for '=' is identical to omission of a OPERATOR_CONCEPT_ID value. Since the use of this field is rare, it's important when devising analyses to not to forget testing for the content of this field for values different from =.",cdm
+MEASUREMENT,value_as_number,No,FLOAT,"This is the numerical value of the Result of the Measurement, if available. Note that measurements such as blood pressures will be split into their component parts i.e. one record for systolic, one record for diastolic.",cdm
+MEASUREMENT,value_as_concept_id,No,INTEGER,If the raw data gives a categorial result for measurements those values are captured and mapped to standard concepts in the 'Meas Value' domain.,cdm
+MEASUREMENT,unit_concept_id,No,INTEGER,"There is currently no recommended unit for individual measurements, i.e. it is not mandatory to represent Hemoglobin a1C measurements as a percentage. UNIT_SOURCE_VALUES should be mapped to a Standard Concept in the Unit domain that best represents the unit as given in the source data.",cdm
+MEASUREMENT,range_low,No,FLOAT,Ranges have the same unit as the VALUE_AS_NUMBER. These ranges are provided by the source and should remain NULL if not given.,cdm
+MEASUREMENT,range_high,No,FLOAT,Ranges have the same unit as the VALUE_AS_NUMBER. These ranges are provided by the source and should remain NULL if not given.,cdm
+MEASUREMENT,provider_id,No,INTEGER,"The provider associated with measurement record, e.g. the provider who ordered the test or the provider who recorded the result.",cdm
+MEASUREMENT,visit_occurrence_id,No,INTEGER,The visit during which the Measurement occurred.,cdm
+MEASUREMENT,visit_detail_id,No,INTEGER,"The VISIT_DETAIL record during which the Measurement occurred. For example, if the Person was in the ICU at the time the VISIT_OCCURRENCE record would reflect the overall hospital stay and the VISIT_DETAIL record would reflect the ICU stay during the hospital visit.",cdm
+MEASUREMENT,measurement_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the Measurement that occurred. For example, this could be an ICD10 or Read code.",cdm
+MEASUREMENT,measurement_source_concept_id,No,INTEGER,"This is the concept representing the MEASUREMENT_SOURCE_VALUE and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Measurement necessary for a given analytic use case. Consider using MEASUREMENT_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+MEASUREMENT,unit_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the unit of the Measurement that occurred. ,cdm
+MEASUREMENT,unit_source_concept_id,No,INTEGER,"""This is the concept representing the UNIT_SOURCE_VALUE and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Measurement necessary for a given analytic use case. Consider using UNIT_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.""",cdm
+MEASUREMENT,value_source_value,No,CHARACTER VARYING,This field houses the verbatim result value of the Measurement from the source data . ,cdm
+MEASUREMENT,measurement_event_id,No,INTEGER,"If the Measurement record is related to another record in the database, this field is the primary key of the linked record. ",cdm
+MEASUREMENT,meas_event_field_concept_id,No,INTEGER,"If the Measurement record is related to another record in the database, this field is the CONCEPT_ID that identifies which table the primary key of the linked record came from. ",cdm
+OBSERVATION,observation_id,Yes,INTEGER,The unique key given to an Observation record for a Person. Refer to the ETL for how duplicate Observations during the same Visit were handled.,cdm
+OBSERVATION,person_id,Yes,INTEGER,The PERSON_ID of the Person for whom the Observation is recorded. This may be a system generated code.,cdm
+OBSERVATION,observation_concept_id,Yes,INTEGER,"The OBSERVATION_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies.",cdm
+OBSERVATION,observation_date,Yes,DATE,"The date of the Observation. Depending on what the Observation represents this could be the date of a lab test, the date of a survey, or the date a patient's family history was taken. ",cdm
+OBSERVATION,observation_datetime,No,DATETIME,,cdm
+OBSERVATION,observation_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Observation record, as in whether the measurement was from an EHR system, insurance claim, registry, or other sources.",cdm
+OBSERVATION,value_as_number,No,FLOAT,"This is the numerical value of the Result of the Observation, if applicable and available. It is not expected that all Observations will have numeric results, rather, this field is here to house values should they exist. ",cdm
+OBSERVATION,value_as_string,No,CHARACTER VARYING,"This is the categorical value of the Result of the Observation, if applicable and available. ",cdm
+OBSERVATION,value_as_concept_id,No,INTEGER,"It is possible that some records destined for the Observation table have two clinical ideas represented in one source code. This is common with ICD10 codes that describe a family history of some Condition, for example. In OMOP the Vocabulary breaks these two clinical ideas into two codes; one becomes the OBSERVATION_CONCEPT_ID and the other becomes the VALUE_AS_CONCEPT_ID. It is important when using the Observation table to keep this possibility in mind and to examine the VALUE_AS_CONCEPT_ID field for relevant information.",cdm
+OBSERVATION,qualifier_concept_id,No,INTEGER,"This field contains all attributes specifying the clinical fact further, such as as degrees, severities, drug-drug interaction alerts etc.",cdm
+OBSERVATION,unit_concept_id,No,INTEGER,There is currently no recommended unit for individual observation concepts. UNIT_SOURCE_VALUES should be mapped to a Standard Concept in the Unit domain that best represents the unit as given in the source data.,cdm
+OBSERVATION,provider_id,No,INTEGER,"The provider associated with the observation record, e.g. the provider who ordered the test or the provider who recorded the result.",cdm
+OBSERVATION,visit_occurrence_id,No,INTEGER,The visit during which the Observation occurred.,cdm
+OBSERVATION,visit_detail_id,No,INTEGER,"The VISIT_DETAIL record during which the Observation occurred. For example, if the Person was in the ICU at the time the VISIT_OCCURRENCE record would reflect the overall hospital stay and the VISIT_DETAIL record would reflect the ICU stay during the hospital visit.",cdm
+OBSERVATION,observation_source_value,No,CHARACTER VARYING,"This field houses the verbatim value from the source data representing the Observation that occurred. For example, this could be an ICD10 or Read code.",cdm
+OBSERVATION,observation_source_concept_id,No,INTEGER,"This is the concept representing the OBSERVATION_SOURCE_VALUE and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Observation necessary for a given analytic use case. Consider using OBSERVATION_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network.",cdm
+OBSERVATION,unit_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the unit of the Observation that occurred. ,cdm
+OBSERVATION,qualifier_source_value,No,CHARACTER VARYING,This field houses the verbatim value from the source data representing the qualifier of the Observation that occurred. ,cdm
+OBSERVATION,value_source_value,No,CHARACTER VARYING,This field houses the verbatim result value of the Observation from the source data.  Do not get confused with the Observation_source_value which captures source value of the observation mapped to observation_concept_id. This field is the observation result value from the source.,cdm
+OBSERVATION,observation_event_id,No,INTEGER,"If the Observation record is related to another record in the database, this field is the primary key of the linked record. ",cdm
+OBSERVATION,obs_event_field_concept_id,No,INTEGER,"If the Observation record is related to another record in the database, this field is the CONCEPT_ID that identifies which table the primary key of the linked record came from. ",cdm
+DEATH,person_id,Yes,INTEGER,,cdm
+DEATH,death_date,Yes,DATE,The date the person was deceased.,cdm
+DEATH,death_datetime,No,DATETIME,,cdm
+DEATH,death_type_concept_id,No,INTEGER,"This is the provenance of the death record, i.e., where it came from. It is possible that an administrative claims database would source death information from a government file so do not assume the Death Type is the same as the Visit Type, etc.",cdm
+DEATH,cause_concept_id,No,INTEGER,"This is the Standard Concept representing the Person's cause of death, if available.",cdm
+DEATH,cause_source_value,No,CHARACTER VARYING,,cdm
+DEATH,cause_source_concept_id,No,INTEGER,,cdm
+NOTE,note_id,Yes,INTEGER,A unique identifier for each note.,cdm
+NOTE,person_id,Yes,INTEGER,,cdm
+NOTE,note_date,Yes,DATE,The date the note was recorded.,cdm
+NOTE,note_datetime,No,DATETIME,,cdm
+NOTE,note_type_concept_id,Yes,INTEGER,The provenance of the note. Most likely this will be EHR. ,cdm
+NOTE,note_class_concept_id,Yes,INTEGER,"A Standard Concept Id representing the HL7 LOINC Document Type Vocabulary classification of the note.",cdm
+NOTE,note_title,No,CHARACTER VARYING,The title of the note.,cdm
+NOTE,note_text,Yes,CHARACTER VARYING,The content of the note.,cdm
+NOTE,encoding_concept_id,Yes,INTEGER,This is the Concept representing the character encoding type. ,cdm
+NOTE,language_concept_id,Yes,INTEGER,The language of the note. ,cdm
+NOTE,provider_id,No,INTEGER,The Provider who wrote the note.,cdm
+NOTE,visit_occurrence_id,No,INTEGER,The Visit during which the note was written. ,cdm
+NOTE,visit_detail_id,No,INTEGER,The Visit Detail during which the note was written.,cdm
+NOTE,note_source_value,No,CHARACTER VARYING,,cdm
+NOTE,note_event_id,No,INTEGER,"If the Note record is related to another record in the database, this field is the primary key of the linked record. ",cdm
+NOTE,note_event_field_concept_id,No,INTEGER,"If the Note record is related to another record in the database, this field is the CONCEPT_ID that identifies which table the primary key of the linked record came from. ",cdm
+NOTE_NLP,note_nlp_id,Yes,INTEGER,A unique identifier for the NLP record.,cdm
+NOTE_NLP,note_id,Yes,INTEGER,This is the NOTE_ID for the NOTE record the NLP record is associated to.,cdm
+NOTE_NLP,section_concept_id,No,INTEGER,,cdm
+NOTE_NLP,snippet,No,CHARACTER VARYING,A small window of text surrounding the term,cdm
+NOTE_NLP,"""offset""",No,CHARACTER VARYING,Character offset of the extracted term in the input note,cdm
+NOTE_NLP,lexical_variant,Yes,CHARACTER VARYING,Raw text extracted from the NLP tool.,cdm
+NOTE_NLP,note_nlp_concept_id,No,INTEGER,,cdm
+NOTE_NLP,note_nlp_source_concept_id,No,INTEGER,,cdm
+NOTE_NLP,nlp_system,No,CHARACTER VARYING,,cdm
+NOTE_NLP,nlp_date,Yes,DATE,The date of the note processing.,cdm
+NOTE_NLP,nlp_datetime,No,DATETIME,The date and time of the note processing.,cdm
+NOTE_NLP,term_exists,No,CHARACTER VARYING,,cdm
+NOTE_NLP,term_temporal,No,CHARACTER VARYING,,cdm
+NOTE_NLP,term_modifiers,No,CHARACTER VARYING,,cdm
+SPECIMEN,specimen_id,Yes,INTEGER,Unique identifier for each specimen.,cdm
+SPECIMEN,person_id,Yes,INTEGER,The person from whom the specimen is collected.,cdm
+SPECIMEN,specimen_concept_id,Yes,INTEGER,,cdm
+SPECIMEN,specimen_type_concept_id,Yes,INTEGER,,cdm
+SPECIMEN,specimen_date,Yes,DATE,The date the specimen was collected.,cdm
+SPECIMEN,specimen_datetime,No,DATETIME,,cdm
+SPECIMEN,quantity,No,FLOAT,The amount of specimen collected from the person.,cdm
+SPECIMEN,unit_concept_id,No,INTEGER,The unit for the quantity of the specimen.,cdm
+SPECIMEN,anatomic_site_concept_id,No,INTEGER,This is the site on the body where the specimen is from.,cdm
+SPECIMEN,disease_status_concept_id,No,INTEGER,,cdm
+SPECIMEN,specimen_source_id,No,CHARACTER VARYING,This is the identifier for the specimen from the source system. ,cdm
+SPECIMEN,specimen_source_value,No,CHARACTER VARYING,,cdm
+SPECIMEN,unit_source_value,No,CHARACTER VARYING,,cdm
+SPECIMEN,anatomic_site_source_value,No,CHARACTER VARYING,,cdm
+SPECIMEN,disease_status_source_value,No,CHARACTER VARYING,,cdm
+FACT_RELATIONSHIP,domain_concept_id_1,Yes,INTEGER,,cdm
+FACT_RELATIONSHIP,fact_id_1,Yes,INTEGER,,cdm
+FACT_RELATIONSHIP,domain_concept_id_2,Yes,INTEGER,,cdm
+FACT_RELATIONSHIP,fact_id_2,Yes,INTEGER,,cdm
+FACT_RELATIONSHIP,relationship_concept_id,Yes,INTEGER,,cdm
+LOCATION,location_id,Yes,INTEGER,The unique key given to a unique Location.,cdm
+LOCATION,address_1,No,CHARACTER VARYING,This is the first line of the address.,cdm
+LOCATION,address_2,No,CHARACTER VARYING,This is the second line of the address,cdm
+LOCATION,city,No,CHARACTER VARYING,,cdm
+LOCATION,state,No,CHARACTER VARYING,,cdm
+LOCATION,zip,No,CHARACTER VARYING,,cdm
+LOCATION,county,No,CHARACTER VARYING,,cdm
+LOCATION,location_source_value,No,CHARACTER VARYING,,cdm
+LOCATION,country_concept_id,No,INTEGER,The Concept Id representing the country. Values should conform to the [Geography](https://athena.ohdsi.org/search-terms/terms?domain=Geography&standardConcept=Standard&page=1&pageSize=15&query=&boosts) domain.,cdm
+LOCATION,country_source_value,No,CHARACTER VARYING,The name of the country.,cdm
+LOCATION,latitude,No,FLOAT,,cdm
+LOCATION,longitude,No,FLOAT,,cdm
+CARE_SITE,care_site_id,Yes,INTEGER,,cdm
+CARE_SITE,care_site_name,No,CHARACTER VARYING,The name of the care_site as it appears in the source data,cdm
+CARE_SITE,place_of_service_concept_id,No,INTEGER,"This is a high-level way of characterizing a Care Site. Typically, however, Care Sites can provide care in multiple settings (inpatient, outpatient, etc.) and this granularity should be reflected in the visit.",cdm
+CARE_SITE,location_id,No,INTEGER,The location_id from the LOCATION table representing the physical location of the care_site.,cdm
+CARE_SITE,care_site_source_value,No,CHARACTER VARYING,The identifier of the care_site as it appears in the source data. This could be an identifier separate from the name of the care_site.,cdm
+CARE_SITE,place_of_service_source_value,No,CHARACTER VARYING,,cdm
+PROVIDER,provider_id,Yes,INTEGER,It is assumed that every provider with a different unique identifier is in fact a different person and should be treated independently.,cdm
+PROVIDER,provider_name,No,CHARACTER VARYING,,cdm
+PROVIDER,npi,No,CHARACTER VARYING,This is the National Provider Number issued to health care providers in the US by the Centers for Medicare and Medicaid Services (CMS).,cdm
+PROVIDER,dea,No,CHARACTER VARYING,"This is the identifier issued by the DEA, a US federal agency, that allows a provider to write prescriptions for controlled substances.",cdm
+PROVIDER,specialty_concept_id,No,INTEGER,"This field either represents the most common specialty that occurs in the data or the most specific concept that represents all specialties listed, should the provider have more than one. This includes physician specialties such as internal medicine, emergency medicine, etc. and allied health professionals such as nurses, midwives, and pharmacists.",cdm
+PROVIDER,care_site_id,No,INTEGER,This is the CARE_SITE_ID for the location that the provider primarily practices in.,cdm
+PROVIDER,year_of_birth,No,INTEGER,,cdm
+PROVIDER,gender_concept_id,No,INTEGER,This field represents the recorded gender of the provider in the source data.,cdm
+PROVIDER,provider_source_value,No,CHARACTER VARYING,Use this field to link back to providers in the source data. This is typically used for error checking of ETL logic.,cdm
+PROVIDER,specialty_source_value,No,CHARACTER VARYING,"This is the kind of provider or specialty as it appears in the source data. This includes physician specialties such as internal medicine, emergency medicine, etc. and allied health professionals such as nurses, midwives, and pharmacists.",cdm
+PROVIDER,specialty_source_concept_id,No,INTEGER,This is often zero as many sites use proprietary codes to store physician speciality.,cdm
+PROVIDER,gender_source_value,No,CHARACTER VARYING,This is provider's gender as it appears in the source data.,cdm
+PROVIDER,gender_source_concept_id,No,INTEGER,This is often zero as many sites use proprietary codes to store provider gender.,cdm
+PAYER_PLAN_PERIOD,payer_plan_period_id,Yes,INTEGER,"A unique identifier for each unique combination of a Person, Payer, Plan, and Period of time.",cdm
+PAYER_PLAN_PERIOD,person_id,Yes,INTEGER,The Person covered by the Plan.,cdm
+PAYER_PLAN_PERIOD,payer_plan_period_start_date,Yes,DATE,Start date of Plan coverage.,cdm
+PAYER_PLAN_PERIOD,payer_plan_period_end_date,Yes,DATE,End date of Plan coverage.,cdm
+PAYER_PLAN_PERIOD,payer_concept_id,No,INTEGER,This field represents the organization who reimburses the provider which administers care to the Person.,cdm
+PAYER_PLAN_PERIOD,payer_source_value,No,CHARACTER VARYING,This is the Payer as it appears in the source data.,cdm
+PAYER_PLAN_PERIOD,payer_source_concept_id,No,INTEGER,,cdm
+PAYER_PLAN_PERIOD,plan_concept_id,No,INTEGER,This field represents the specific health benefit Plan the Person is enrolled in.,cdm
+PAYER_PLAN_PERIOD,plan_source_value,No,CHARACTER VARYING,This is the health benefit Plan of the Person as it appears in the source data.,cdm
+PAYER_PLAN_PERIOD,plan_source_concept_id,No,INTEGER,,cdm
+PAYER_PLAN_PERIOD,sponsor_concept_id,No,INTEGER,"This field represents the sponsor of the Plan who finances the Plan. This includes self-insured, small group health plan and large group health plan.",cdm
+PAYER_PLAN_PERIOD,sponsor_source_value,No,CHARACTER VARYING,The Plan sponsor as it appears in the source data.,cdm
+PAYER_PLAN_PERIOD,sponsor_source_concept_id,No,INTEGER,,cdm
+PAYER_PLAN_PERIOD,family_source_value,No,CHARACTER VARYING,The common identifier for all people (often a family) that covered by the same policy.,cdm
+PAYER_PLAN_PERIOD,stop_reason_concept_id,No,INTEGER,"This field represents the reason the Person left the Plan, if known.",cdm
+PAYER_PLAN_PERIOD,stop_reason_source_value,No,CHARACTER VARYING,The Plan stop reason as it appears in the source data.,cdm
+PAYER_PLAN_PERIOD,stop_reason_source_concept_id,No,INTEGER,,cdm
+COST,cost_id,Yes,INTEGER,,cdm
+COST,cost_event_id,Yes,INTEGER,,cdm
+COST,cost_domain_id,Yes,CHARACTER VARYING,,cdm
+COST,cost_type_concept_id,Yes,INTEGER,,cdm
+COST,currency_concept_id,No,INTEGER,,cdm
+COST,total_charge,No,FLOAT,,cdm
+COST,total_cost,No,FLOAT,,cdm
+COST,total_paid,No,FLOAT,,cdm
+COST,paid_by_payer,No,FLOAT,,cdm
+COST,paid_by_patient,No,FLOAT,,cdm
+COST,paid_patient_copay,No,FLOAT,,cdm
+COST,paid_patient_coinsurance,No,FLOAT,,cdm
+COST,paid_patient_deductible,No,FLOAT,,cdm
+COST,paid_by_primary,No,FLOAT,,cdm
+COST,paid_ingredient_cost,No,FLOAT,,cdm
+COST,paid_dispensing_fee,No,FLOAT,,cdm
+COST,payer_plan_period_id,No,INTEGER,,cdm
+COST,amount_allowed,No,FLOAT,,cdm
+COST,revenue_code_concept_id,No,INTEGER,,cdm
+COST,revenue_code_source_value,No,CHARACTER VARYING,Revenue codes are a method to charge for a class of procedures and conditions in the U.S. hospital system.,cdm
+COST,drg_concept_id,No,INTEGER,,cdm
+COST,drg_source_value,No,CHARACTER VARYING,Diagnosis Related Groups are US codes used to classify hospital cases into one of approximately 500 groups.,cdm
+DRUG_ERA,drug_era_id,Yes,INTEGER,,cdm
+DRUG_ERA,person_id,Yes,INTEGER,,cdm
+DRUG_ERA,drug_concept_id,Yes,INTEGER,The Concept Id representing the specific drug ingredient.,cdm
+DRUG_ERA,drug_era_start_date,Yes,DATETIME,,cdm
+DRUG_ERA,drug_era_end_date,Yes,DATETIME,,cdm
+DRUG_ERA,drug_exposure_count,No,INTEGER,,cdm
+DRUG_ERA,gap_days,No,INTEGER,,cdm
+DOSE_ERA,dose_era_id,Yes,INTEGER,,cdm
+DOSE_ERA,person_id,Yes,INTEGER,,cdm
+DOSE_ERA,drug_concept_id,Yes,INTEGER,The Concept Id representing the specific drug ingredient.,cdm
+DOSE_ERA,unit_concept_id,Yes,INTEGER,The Concept Id representing the unit of the specific drug ingredient.,cdm
+DOSE_ERA,dose_value,Yes,FLOAT,The numeric value of the dosage of the drug_ingredient.,cdm
+DOSE_ERA,dose_era_start_date,Yes,DATETIME,"The date the Person started on the specific dosage, with at least 31 days since any prior exposure.",cdm
+DOSE_ERA,dose_era_end_date,Yes,DATETIME,,cdm
+CONDITION_ERA,condition_era_id,Yes,INTEGER,,cdm
+CONDITION_ERA,person_id,Yes,INTEGER,,cdm
+CONDITION_ERA,condition_concept_id,Yes,INTEGER,The Concept Id representing the Condition.,cdm
+CONDITION_ERA,condition_era_start_date,Yes,DATETIME,"The start date for the Condition Era
+constructed from the individual
+instances of Condition Occurrences.
+It is the start date of the very first
+chronologically recorded instance of
+the condition with at least 31 days since any prior record of the same Condition.",cdm
+CONDITION_ERA,condition_era_end_date,Yes,DATETIME,"The end date for the Condition Era
+constructed from the individual
+instances of Condition Occurrences.
+It is the end date of the final
+continuously recorded instance of the
+Condition.",cdm
+CONDITION_ERA,condition_occurrence_count,No,INTEGER,"The number of individual Condition
+Occurrences used to construct the
+condition era.",cdm
+EPISODE,episode_id,Yes,bigint,A unique identifier for each Episode.,cdm
+EPISODE,person_id,Yes,bigint,The PERSON_ID of the PERSON for whom the episode is recorded.,cdm
+EPISODE,episode_concept_id,Yes,INTEGER,"The EPISODE_CONCEPT_ID represents the kind abstraction related to the disease phase, outcome or treatment.",cdm
+EPISODE,episode_start_date,Yes,DATE,The date when the Episode beings. ,cdm
+EPISODE,episode_start_datetime,No,DATETIME,The date and time when the Episode begins.,cdm
+EPISODE,episode_end_date,No,DATE,The date when the instance of the Episode is considered to have ended.,cdm
+EPISODE,episode_end_datetime,No,DATETIME,The date when the instance of the Episode is considered to have ended.,cdm
+EPISODE,episode_parent_id,No,INTEGER,Use this field to find the Episode that subsumes the given Episode record. This is used in the case that an Episode are nested into each other.,cdm
+EPISODE,episode_number,No,INTEGER,"For sequences of episodes, this is used to indicate the order the episodes occurred. For example, lines of treatment could be indicated here. ",cdm
+EPISODE,episode_object_concept_id,Yes,INTEGER,"A Standard Concept representing the disease phase, outcome, or other abstraction of which the episode consists.  For example, if the EPISODE_CONCEPT_ID is [treatment regimen](https://athena.ohdsi.org/search-terms/terms/32531) then the EPISODE_OBJECT_CONCEPT_ID should contain the chemotherapy regimen concept, like [Afatinib monotherapy](https://athena.ohdsi.org/search-terms/terms/35804392).",cdm
+EPISODE,episode_type_concept_id,Yes,INTEGER,"This field can be used to determine the provenance of the Episode record, as in whether the episode was from an EHR system, insurance claim, registry, or other sources.",cdm
+EPISODE,episode_source_value,No,CHARACTER VARYING,The source code for the Episdoe as it appears in the source data. This code is mapped to a Standard Condition Concept in the Standardized Vocabularies and the original code is stored here for reference.,cdm
+EPISODE,episode_source_concept_id,No,INTEGER,A foreign key to a Episode Concept that refers to the code used in the source.,cdm
+EPISODE_EVENT,episode_id,Yes,INTEGER,Use this field to link the EPISODE_EVENT record to its EPISODE.,cdm
+EPISODE_EVENT,event_id,Yes,INTEGER,"This field is the primary key of the linked record in the database. For example, if the Episode Event is a Condition Occurrence, then the CONDITION_OCCURRENCE_ID of the linked record goes in this field. ",cdm
+EPISODE_EVENT,episode_event_field_concept_id,Yes,INTEGER,This field is the CONCEPT_ID that identifies which table the primary key of the linked record came from. ,cdm
+METADATA,metadata_id,Yes,INTEGER,The unique key given to a Metadata record.,cdm
+METADATA,metadata_concept_id,Yes,INTEGER,,cdm
+METADATA,metadata_type_concept_id,Yes,INTEGER,,cdm
+METADATA,name,Yes,CHARACTER VARYING,,cdm
+METADATA,value_as_string,No,CHARACTER VARYING,,cdm
+METADATA,value_as_concept_id,No,INTEGER,,cdm
+METADATA,value_as_number,No,FLOAT,"This is the numerical value of the result of the Metadata, if applicable and available. It is not expected that all Metadata will have numeric results, rather, this field is here to house values should they exist. ",cdm
+METADATA,metadata_date,No,DATE,,cdm
+METADATA,metadata_datetime,No,DATETIME,,cdm
+CDM_SOURCE,cdm_source_name,Yes,CHARACTER VARYING,The name of the CDM instance.,cdm
+CDM_SOURCE,cdm_source_abbreviation,Yes,CHARACTER VARYING,The abbreviation of the CDM instance.,cdm
+CDM_SOURCE,cdm_holder,Yes,CHARACTER VARYING,The holder of the CDM instance.,cdm
+CDM_SOURCE,source_description,No,CHARACTER VARYING,The description of the CDM instance.,cdm
+CDM_SOURCE,source_documentation_reference,No,CHARACTER VARYING,,cdm
+CDM_SOURCE,cdm_etl_reference,No,CHARACTER VARYING,,cdm
+CDM_SOURCE,source_release_date,Yes,DATE,The release date of the source data.,cdm
+CDM_SOURCE,cdm_release_date,Yes,DATE,The release data of the CDM instance.,cdm
+CDM_SOURCE,cdm_version,No,CHARACTER VARYING,,cdm
+CDM_SOURCE,cdm_version_concept_id,Yes,INTEGER,The Concept Id representing the version of the CDM.,cdm
+CDM_SOURCE,vocabulary_version,Yes,CHARACTER VARYING,,cdm
+COHORT,cohort_definition_id,Yes,INTEGER,,results
+COHORT,subject_id,Yes,INTEGER,,results
+COHORT,cohort_start_date,Yes,DATE,,results
+COHORT,cohort_end_date,Yes,DATE,,results
+COHORT_DEFINITION,cohort_definition_id,Yes,INTEGER,"This is the identifier given to the cohort, usually by the ATLAS application",results
+COHORT_DEFINITION,cohort_definition_name,Yes,CHARACTER VARYING,A short description of the cohort,results
+COHORT_DEFINITION,cohort_definition_description,No,CHARACTER VARYING,A complete description of the cohort.,results
+COHORT_DEFINITION,definition_type_concept_id,Yes,INTEGER,Type defining what kind of Cohort Definition the record represents and how the syntax may be executed.,results
+COHORT_DEFINITION,cohort_definition_syntax,No,CHARACTER VARYING,Syntax or code to operationalize the Cohort Definition.,results
+COHORT_DEFINITION,subject_concept_id,Yes,INTEGER,"This field contains a Concept that represents the domain of the subjects that are members of the cohort (e.g., Person, Provider, Visit).",results
+COHORT_DEFINITION,cohort_initiation_date,No,DATE,A date to indicate when the Cohort was initiated in the COHORT table.,results
\ No newline at end of file
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.csv
deleted file mode 100644
index cb28880e..00000000
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV5.csv
+++ /dev/null
@@ -1,298 +0,0 @@
-TABLE_NAME,COLUMN_NAME,IS_NULLABLE,DATA_TYPE,DESCRIPTION,
-LOCATION,LOCATION_ID,NO,INTEGER,A unique identifier for each geographic location.,
-LOCATION,ADDRESS_1,YES,CHARACTER VARYING,"The address field 1, typically used for the street address, as it appears in the source data.",
-LOCATION,ADDRESS_2,YES,CHARACTER VARYING,"The address field 2, typically used for additional detail such as buildings, suites, floors, as it appears in the source data.",
-LOCATION,CITY,YES,CHARACTER VARYING,The city field as it appears in the source data.,
-LOCATION,STATE,YES,CHARACTER VARYING,The state field as it appears in the source data.,
-LOCATION,ZIP,YES,CHARACTER VARYING,The zip or postal code.,
-LOCATION,COUNTY,YES,CHARACTER VARYING,The county.,
-LOCATION,LOCATION_SOURCE_VALUE,YES,CHARACTER VARYING,The verbatim information that is used to uniquely identify the location as it appears in the source data.,
-PERSON,PERSON_ID,NO,INTEGER,A unique identifier for each person.,
-PERSON,GENDER_CONCEPT_ID,NO,INTEGER,A foreign key that refers to an identifier in the CONCEPT table for the unique gender of the person.,
-PERSON,YEAR_OF_BIRTH,NO,INTEGER,"The year of birth of the person. For data sources with date of birth, the year is extracted. For data sources where the year of birth is not available, the approximate year of birth is derived based on any age group categorization available.",
-PERSON,MONTH_OF_BIRTH,YES,INTEGER,"The month of birth of the person. For data sources that provide the precise date of birth, the month is extracted and stored in this field.",
-PERSON,DAY_OF_BIRTH,YES,INTEGER,"The day of the month of birth of the person. For data sources that provide the precise date of birth, the day is extracted and stored in this field.",
-PERSON,TIME_OF_BIRTH,YES,CHARACTER VARYING,The time of birth at the birth day,
-PERSON,RACE_CONCEPT_ID,NO,INTEGER,A foreign key that refers to an identifier in the CONCEPT table for the unique race of the person.,
-PERSON,ETHNICITY_CONCEPT_ID,NO,INTEGER,A foreign key that refers to the standard concept identifier in the Standardized Vocabularies for the ethnicity of the person.,
-PERSON,LOCATION_ID,YES,INTEGER,"A foreign key to the place of residency for the person in the location table, where the detailed address information is stored.",
-PERSON,PROVIDER_ID,YES,INTEGER,A foreign key to the primary care provider the person is seeing in the provider table.,
-PERSON,CARE_SITE_ID,YES,INTEGER,"A foreign key to the site of primary care in the care_site table, where the details of the care site are stored.",
-PERSON,PERSON_SOURCE_VALUE,YES,CHARACTER VARYING,An (encrypted) key derived from the person identifier in the source data. This is necessary when a use case requires a link back to the person data at the source dataset.,
-PERSON,GENDER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the gender of the person as it appears in the source data. The person’s gender is mapped to a standard gender concept in the Standardized Vocabularies; the original value is stored here for reference.,
-PERSON,GENDER_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to the gender concept that refers to the code used in the source.,
-PERSON,RACE_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the race of the person as it appears in the source data. The person race is mapped to a standard race concept in the Standardized Vocabularies and the original value is stored here for reference.,
-PERSON,RACE_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to the race concept that refers to the code used in the source.,
-PERSON,ETHNICITY_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the ethnicity of the person as it appears in the source data. The person ethnicity is mapped to a standard ethnicity concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-PERSON,ETHNICITY_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to the ethnicity concept that refers to the code used in the source.,
-OBSERVATION_PERIOD,OBSERVATION_PERIOD_ID,NO,INTEGER,A unique identifier for each observation period.,
-OBSERVATION_PERIOD,PERSON_ID,NO,INTEGER,A foreign key identifier to the person for whom the observation period is defined. The demographic details of that person are stored in the person table.,
-OBSERVATION_PERIOD,OBSERVATION_PERIOD_START_DATE,NO,DATE,The start date of the observation period for which data are available from the data source.,
-OBSERVATION_PERIOD,OBSERVATION_PERIOD_END_DATE,NO,DATE,The end date of the observation period for which data are available from the data source.,
-OBSERVATION_PERIOD,PERIOD_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key identifier to the predefined concept in the Standardized Vocabularies reflecting the source of the observation period information,
-CARE_SITE,CARE_SITE_ID,NO,INTEGER,A unique identifier for each Care Site.,
-CARE_SITE,CARE_SITE_NAME,YES,CHARACTER VARYING,The description or name of the Care Site,
-CARE_SITE,PLACE_OF_SERVICE_CONCEPT_ID,YES,INTEGER,A foreign key that refers to a Place of Service Concept ID in the Standardized Vocabularies.,
-CARE_SITE,LOCATION_ID,YES,INTEGER,"A foreign key to the geographic Location of the Care Site in the LOCATION table, where the detailed address information is stored.",
-CARE_SITE,CARE_SITE_SOURCE_VALUE,YES,CHARACTER VARYING,"The identifier for the Care Site in the source data, stored here for reference.",
-CARE_SITE,PLACE_OF_SERVICE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Place of Service as it appears in the source data, stored here for reference.",
-VISIT_OCCURRENCE,VISIT_OCCURRENCE_ID,NO,INTEGER,A unique identifier for each Person's visit or encounter at a healthcare provider.,
-VISIT_OCCURRENCE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person for whom the visit is recorded. The demographic details of that Person are stored in the PERSON table.,
-VISIT_OCCURRENCE,VISIT_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a visit Concept identifier in the Standardized Vocabularies.,
-VISIT_OCCURRENCE,VISIT_START_DATE,NO,DATE,The start date of the visit.,
-VISIT_OCCURRENCE,VISIT_START_TIME,YES,CHARACTER VARYING,The time the visit started.,
-VISIT_OCCURRENCE,VISIT_END_DATE,NO,DATE,The end date of the visit. If this is a one-day visit the end date should match the start date.,
-VISIT_OCCURRENCE,VISIT_END_TIME,YES,CHARACTER VARYING,The time the visit ended.,
-VISIT_OCCURRENCE,VISIT_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the visit record is derived.,
-VISIT_OCCURRENCE,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the provider table who was associated with the visit.,
-VISIT_OCCURRENCE,CARE_SITE_ID,YES,INTEGER,A foreign key to the care site in the care site table that was visited.,
-VISIT_OCCURRENCE,VISIT_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the visit as it appears in the source data.,
-VISIT_OCCURRENCE,VISIT_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept that refers to the code used in the source.,
-PROVIDER,PROVIDER_ID,NO,INTEGER,A unique identifier for each Provider.,
-PROVIDER,PROVIDER_NAME,YES,CHARACTER VARYING,A description of the Provider.,
-PROVIDER,NPI,YES,CHARACTER VARYING,The National Provider Identifier (NPI) of the provider.,
-PROVIDER,DEA,YES,CHARACTER VARYING,The Drug Enforcement Administration (DEA) number of the provider.,
-PROVIDER,SPECIALTY_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Specialty Concept ID in the Standardized Vocabularies.,
-PROVIDER,CARE_SITE_ID,YES,INTEGER,A foreign key to the main Care Site where the provider is practicing.,
-PROVIDER,YEAR_OF_BIRTH,YES,INTEGER,The year of birth of the Provider.,
-PROVIDER,GENDER_CONCEPT_ID,YES,INTEGER,The gender of the Provider.,
-PROVIDER,PROVIDER_SOURCE_VALUE,YES,CHARACTER VARYING,"The identifier used for the Provider in the source data, stored here for reference.",
-PROVIDER,SPECIALTY_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Provider specialty as it appears in the source data, stored here for reference.",
-PROVIDER,SPECIALTY_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept that refers to the code used in the source.,
-PROVIDER,GENDER_SOURCE_VALUE,YES,CHARACTER VARYING,"The gender code for the Provider as it appears in the source data, stored here for reference.",
-PROVIDER,GENDER_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept that refers to the code used in the source.,
-CONDITION_OCCURRENCE,CONDITION_OCCURRENCE_ID,NO,INTEGER,A unique identifier for each Condition Occurrence event.,
-CONDITION_OCCURRENCE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is experiencing the condition. The demographic details of that Person are stored in the PERSON table.,
-CONDITION_OCCURRENCE,CONDITION_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Condition Concept identifier in the Standardized Vocabularies.,
-CONDITION_OCCURRENCE,CONDITION_START_DATE,NO,DATE,The date when the instance of the Condition is recorded.,
-CONDITION_OCCURRENCE,CONDITION_END_DATE,YES,DATE,The date when the instance of the Condition is considered to have ended.,
-CONDITION_OCCURRENCE,CONDITION_TYPE_CONCEPT_ID,NO,INTEGER,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the condition was recorded, the level of standardization, and the type of occurrence.",
-CONDITION_OCCURRENCE,STOP_REASON,YES,CHARACTER VARYING,"The reason that the condition was no longer present, as indicated in the source data.",
-CONDITION_OCCURRENCE,PROVIDER_ID,YES,INTEGER,A foreign key to the Provider in the PROVIDER table who was responsible for capturing (diagnosing) the Condition.,
-CONDITION_OCCURRENCE,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the VISIT table during which the Condition was determined (diagnosed).,
-CONDITION_OCCURRENCE,CONDITION_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the condition as it appears in the source data. This code is mapped to a standard condition concept in the Standardized Vocabularies and the original code is stored here for reference.,
-CONDITION_OCCURRENCE,CONDITION_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Condition Concept that refers to the code used in the source.,
-DEATH,PERSON_ID,NO,INTEGER,A foreign key identifier to the deceased person. The demographic details of that person are stored in the person table.,
-DEATH,DEATH_DATE,NO,DATE,"The date the person was deceased. If the precise date including day or month is not known or not allowed, December is used as the default month, and the last day of the month the default day.",
-DEATH,DEATH_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key referring to the predefined concept identifier in the Standardized Vocabularies reflecting how the death was represented in the source data.,
-DEATH,CAUSE_CONCEPT_ID,YES,INTEGER,A foreign key referring to a standard concept identifier in the Standardized Vocabularies for conditions.,
-DEATH,CAUSE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the cause of death as it appears in the source data. This code is mapped to a standard concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-DEATH,CAUSE_SOURCE_CONCEPT_ID,YES,INTEGER,"A foreign key to the concept that refers to the code used in the source. Note, this variable name is abbreviated to ensure it will be allowable across database platforms.",
-DRUG_EXPOSURE,DRUG_EXPOSURE_ID,NO,INTEGER,A system-generated unique identifier for each Drug utilization event.,
-DRUG_EXPOSURE,PERSON_ID,NO,INTEGER,A foreign key identifier to the person who is subjected to the Drug. The demographic details of that person are stored in the person table.,
-DRUG_EXPOSURE,DRUG_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Drug concept.,
-DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATE,NO,DATE,"The start date for the current instance of Drug utilization. Valid entries include a start date of a prescription, the date a prescription was filled, or the date on which a Drug administration procedure was recorded.",
-DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATE,YES,DATE,The end date for the current instance of Drug utilization. It is not available from all sources.,
-DRUG_EXPOSURE,DRUG_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Drug Exposure recorded. It indicates how the Drug Exposure was represented in the source data.,
-DRUG_EXPOSURE,STOP_REASON,YES,CHARACTER VARYING,"The reason the Drug was stopped. Reasons include regimen completed, changed, removed, etc.",
-DRUG_EXPOSURE,REFILLS,YES,INTEGER,"The number of refills after the initial prescription. The initial prescription is not counted, values start with 0.",
-DRUG_EXPOSURE,QUANTITY,YES,NUMERIC,The quantity of drug as recorded in the original prescription or dispensing record.,
-DRUG_EXPOSURE,DAYS_SUPPLY,YES,INTEGER,The number of days of supply of the medication as recorded in the original prescription or dispensing record.,
-DRUG_EXPOSURE,SIG,YES,TEXT,The directions (“signetur”) on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.,
-DRUG_EXPOSURE,ROUTE_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration.,
-DRUG_EXPOSURE,EFFECTIVE_DRUG_DOSE,YES,NUMERIC,Numerical value of Drug dose for this Drug Exposure record.,
-DRUG_EXPOSURE,DOSE_UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the unit the effective_drug_dose value is expressed.,
-DRUG_EXPOSURE,LOT_NUMBER,YES,CHARACTER VARYING,An identifier assigned to a particular quantity or lot of Drug product from the manufacturer.,
-DRUG_EXPOSURE,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the provider table who initiated (prescribed or administered) the Drug Exposure.,
-DRUG_EXPOSURE,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the visit table during which the Drug Exposure was initiated.,
-DRUG_EXPOSURE,DRUG_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Drug as it appears in the source data. This code is mapped to a Standard Drug concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-DRUG_EXPOSURE,DRUG_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Drug Concept that refers to the code used in the source.,
-DRUG_EXPOSURE,ROUTE_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the route of administration as detailed in the source.,
-DRUG_EXPOSURE,DOSE_UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the dose unit as detailed in the source.,
-DEVICE_EXPOSURE,DEVICE_EXPOSURE_ID,NO,INTEGER,A system-generated unique identifier for each Device Exposure.,
-DEVICE_EXPOSURE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is subjected to the Device. The demographic details of that person are stored in the Person table.,
-DEVICE_EXPOSURE,DEVICE_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Device concept.,
-DEVICE_EXPOSURE,DEVICE_EXPOSURE_START_DATE,NO,DATE,The date the Device or supply was applied or used.,
-DEVICE_EXPOSURE,DEVICE_EXPOSURE_END_DATE,YES,DATE,The date the Device or supply was removed from use.,
-DEVICE_EXPOSURE,DEVICE_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of Device Exposure recorded. It indicates how the Device Exposure was represented in the source data.,
-DEVICE_EXPOSURE,UNIQUE_DEVICE_ID,YES,CHARACTER VARYING,A UDI or equivalent identifying the instance of the Device used in the Person.,
-DEVICE_EXPOSURE,QUANTITY,YES,INTEGER,The number of individual Devices used for the exposure.,
-DEVICE_EXPOSURE,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the PROVIDER table who initiated of administered the Device.,
-DEVICE_EXPOSURE,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the VISIT table during which the device was used.,
-DEVICE_EXPOSURE,DEVICE_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the Device as it appears in the source data. This code is mapped to a standard Device Concept in the Standardized Vocabularies and the original code is stored here for reference.,
-DEVICE_EXPOSURE,DEVICE_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Device Concept that refers to the code used in the source.,
-PROCEDURE_OCCURRENCE,PROCEDURE_OCCURRENCE_ID,NO,INTEGER,A system-generated unique identifier for each Procedure Occurrence.,
-PROCEDURE_OCCURRENCE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is subjected to the Procedure. The demographic details of that Person are stored in the PERSON table.,
-PROCEDURE_OCCURRENCE,PROCEDURE_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a standard procedure Concept identifier in the Standardized Vocabularies.,
-PROCEDURE_OCCURRENCE,PROCEDURE_DATE,NO,DATE,The date on which the Procedure was performed.,
-PROCEDURE_OCCURRENCE,PROCEDURE_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the type of source data from which the procedure record is derived.,
-PROCEDURE_OCCURRENCE,MODIFIER_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for a modifier to the Procedure (e.g. bilateral),
-PROCEDURE_OCCURRENCE,QUANTITY,YES,INTEGER,The quantity of procedures ordered or administered.,
-PROCEDURE_OCCURRENCE,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the provider table who was responsible for carrying out the procedure.,
-PROCEDURE_OCCURRENCE,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the visit table during which the Procedure was carried out.,
-PROCEDURE_OCCURRENCE,PROCEDURE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Procedure as it appears in the source data. This code is mapped to a standard procedure Concept in the Standardized Vocabularies and the original code is, stored here for reference. Procedure source codes are typically ICD-9-Proc, CPT-4, HCPCS or OPCS-4 codes.",
-PROCEDURE_OCCURRENCE,PROCEDURE_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Procedure Concept that refers to the code used in the source.,
-PROCEDURE_OCCURRENCE,QUALIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the qualifier as it appears in the source data.,
-MEASUREMENT,MEASUREMENT_ID,NO,INTEGER,A unique identifier for each Measurement.,
-MEASUREMENT,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person about whom the measurement was recorded. The demographic details of that Person are stored in the PERSON table.,
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,NO,INTEGER,A foreign key to the standard measurement concept identifier in the Standardized Vocabularies.,
-MEASUREMENT,MEASUREMENT_DATE,NO,DATE,The date of the Measurement.,
-MEASUREMENT,MEASUREMENT_TIME,YES,CHARACTER VARYING,"The time of the Measurement. (Some database systems don't have a datatype of time. To accomodate all temporal analyses, datatype datetime can be used (combining measurement_date and measurement_time)Relevant Forum Discussion",
-MEASUREMENT,MEASUREMENT_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the provenance from where the Measurement record was recorded.,
-MEASUREMENT,OPERATOR_CONCEPT_ID,YES,INTEGER,"A foreign key identifier to the predefined Concept in the Standardized Vocabularies reflecting the mathematical operator that is applied to the value_as_number. Operators are <, ?, =, ?, >.",
-MEASUREMENT,VALUE_AS_NUMBER,YES,NUMERIC,A Measurement result where the result is expressed as a numeric value.,
-MEASUREMENT,VALUE_AS_CONCEPT_ID,YES,INTEGER,"A foreign key to a Measurement result represented as a Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).",
-MEASUREMENT,UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept ID of Measurement Units in the Standardized Vocabularies.,
-MEASUREMENT,RANGE_LOW,YES,NUMERIC,The lower limit of the normal range of the Measurement result. The lower range is assumed to be of the same unit of measure as the Measurement value.,
-MEASUREMENT,RANGE_HIGH,YES,NUMERIC,The upper limit of the normal range of the Measurement. The upper range is assumed to be of the same unit of measure as the Measurement value.,
-MEASUREMENT,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the PROVIDER table who was responsible for initiating or obtaining the measurement.,
-MEASUREMENT,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the Visit in the VISIT_OCCURRENCE table during which the Measurement was recorded.,
-MEASUREMENT,MEASUREMENT_SOURCE_VALUE,YES,CHARACTER VARYING,The Measurement name as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference.,
-MEASUREMENT,MEASUREMENT_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept in the Standard Vocabularies that refers to the code used in the source.,
-MEASUREMENT,UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is stored here for reference.,
-MEASUREMENT,VALUE_SOURCE_VALUE,YES,CHARACTER VARYING,The source value associated with the content of the value_as_number or value_as_concept as stored in the source data.,
-OBSERVATION,OBSERVATION_ID,NO,INTEGER,A unique identifier for each observation.,
-OBSERVATION,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person about whom the observation was recorded. The demographic details of that Person are stored in the PERSON table.,
-OBSERVATION,OBSERVATION_CONCEPT_ID,NO,INTEGER,A foreign key to the standard observation concept identifier in the Standardized Vocabularies.,
-OBSERVATION,OBSERVATION_DATE,NO,DATE,The date of the observation.,
-OBSERVATION,OBSERVATION_TIME,YES,CHARACTER VARYING,The time of the observation.,
-OBSERVATION,OBSERVATION_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key to the predefined concept identifier in the Standardized Vocabularies reflecting the type of the observation.,
-OBSERVATION,VALUE_AS_NUMBER,YES,NUMERIC,The observation result stored as a number. This is applicable to observations where the result is expressed as a numeric value.,
-OBSERVATION,VALUE_AS_STRING,YES,CHARACTER VARYING,The observation result stored as a string. This is applicable to observations where the result is expressed as verbatim text.,
-OBSERVATION,VALUE_AS_CONCEPT_ID,YES,INTEGER,"A foreign key to an observation result stored as a Concept ID. This is applicable to observations where the result can be expressed as a Standard Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.).",
-OBSERVATION,QUALIFIER_CONCEPT_ID,YES,INTEGER,"A foreign key to a Standard Concept ID for a qualifier (e.g., severity of drug-drug interaction alert)",
-OBSERVATION,UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept ID of measurement units in the Standardized Vocabularies.,
-OBSERVATION,PROVIDER_ID,YES,INTEGER,A foreign key to the provider in the PROVIDER table who was responsible for making the observation.,
-OBSERVATION,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the VISIT_OCCURRENCE table during which the observation was recorded.,
-OBSERVATION,OBSERVATION_SOURCE_VALUE,YES,CHARACTER VARYING,"The observation code as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-OBSERVATION,OBSERVATION_SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept that refers to the code used in the source.,
-OBSERVATION,UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-OBSERVATION,QUALIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,The source value associated with a qualifier to characterize the observation,
-NOTE,NOTE_ID,NO,INTEGER,A unique identifier for each note.,
-NOTE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person about whom the Note was recorded. The demographic details of that Person are stored in the PERSON table.,
-NOTE,NOTE_DATE,NO,DATE,The date the note was recorded.,
-NOTE,NOTE_TIME,YES,CHARACTER VARYING,The time the note was recorded.,
-NOTE,NOTE_TYPE_CONCEPT_ID,NO,INTEGER,"A foreign key to the predefined Concept in the Standardized Vocabularies reflecting the type, origin or provenance of the Note.",
-NOTE,NOTE_TEXT,NO,TEXT,The content of the Note.,
-NOTE,PROVIDER_ID,YES,INTEGER,A foreign key to the Provider in the PROVIDER table who took the Note.,
-NOTE,VISIT_OCCURRENCE_ID,YES,INTEGER,Foreign key to the Visit in the VISIT_OCCURRENCE table when the Note was taken.,
-NOTE,NOTE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source value associated with the origin of the Note, as standardized using the note_tyype_concept_id",
-SPECIMEN,SPECIMEN_ID,NO,INTEGER,A unique identifier for each specimen.,
-SPECIMEN,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person for whom the Specimen is recorded.,
-SPECIMEN,SPECIMEN_CONCEPT_ID,NO,INTEGER,A foreign key referring to a Standard Concept identifier in the Standardized Vocabularies for the Specimen.,
-SPECIMEN,SPECIMEN_TYPE_CONCEPT_ID,NO,INTEGER,A foreign key referring to the Concept identifier in the Standardized Vocabularies reflecting the system of record from which the Specimen was represented in the source data.,
-SPECIMEN,SPECIMEN_DATE,NO,DATE,The date the specimen was obtained from the Person.,
-SPECIMEN,SPECIMEN_TIME,YES,CHARACTER VARYING,The time on the date when the Specimen was obtained from the person.,
-SPECIMEN,QUANTITY,YES,NUMERIC,The amount of specimen collection from the person during the sampling procedure.,
-SPECIMEN,UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for the Unit associated with the numeric quantity of the Specimen collection.,
-SPECIMEN,ANATOMIC_SITE_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for the anatomic location of specimen collection.,
-SPECIMEN,DISEASE_STATUS_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for the Disease Status of specimen collection.,
-SPECIMEN,SPECIMEN_SOURCE_ID,YES,CHARACTER VARYING,The Specimen identifier as it appears in the source data.,
-SPECIMEN,SPECIMEN_SOURCE_VALUE,YES,CHARACTER VARYING,"The Specimen value as it appears in the source data. This value is mapped to a Standard Concept in the Standardized Vocabularies and the original code is, stored here for reference.",
-SPECIMEN,UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the Unit as detailed in the source.,
-SPECIMEN,ANATOMIC_SITE_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the anatomic site as detailed in the source.,
-SPECIMEN,DISEASE_STATUS_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the disease status as detailed in the source.,
-FACT_RELATIONSHIP,DOMAIN_CONCEPT_ID_1,NO,INTEGER,"The concept representing the domain of fact one, from which the corresponding table can be inferred.",
-FACT_RELATIONSHIP,FACT_ID_1,NO,INTEGER,The unique identifier in the table corresponding to the domain of fact one.,
-FACT_RELATIONSHIP,DOMAIN_CONCEPT_ID_2,NO,INTEGER,"The concept representing the domain of fact two, from which the corresponding table can be inferred.",
-FACT_RELATIONSHIP,FACT_ID_2,NO,INTEGER,The unique identifier in the table corresponding to the domain of fact two.,
-FACT_RELATIONSHIP,RELATIONSHIP_CONCEPT_ID,NO,INTEGER,A foreign key to a Standard Concept ID of relationship in the Standardized Vocabularies.,
-PROCEDURE_COST,PROCEDURE_COST_ID,NO,INTEGER,A unique identifier for each procedure cost record.,
-PROCEDURE_COST,PROCEDURE_OCCURRENCE_ID,NO,INTEGER,A foreign key identifier to the procedure record for which cost data are recorded.,
-PROCEDURE_COST,CURRENCY_CONCEPT_ID,YES,INTEGER,"A concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.",
-PROCEDURE_COST,PAID_COPAY,YES,NUMERIC,The amount paid by the Person as a fixed contribution to the expenses. Copay does not contribute to the out_of_pocket expenses.,
-PROCEDURE_COST,PAID_COINSURANCE,YES,NUMERIC,"The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the health benefit Plan after the Person's deductible is exceeded.",
-PROCEDURE_COST,PAID_TOWARD_DEDUCTIBLE,YES,NUMERIC,The amount paid by the Person that is counted toward the deductible defined by the health benefit Plan.,
-PROCEDURE_COST,PAID_BY_PAYER,YES,NUMERIC,"The amount paid by the Payer. If there is more than one Payer, several PROCEDURE_COST records indicate that fact.",
-PROCEDURE_COST,PAID_BY_COORDINATION_BENEFITS,YES,NUMERIC,The amount paid by a secondary Payer through the coordination of benefits.,
-PROCEDURE_COST,TOTAL_OUT_OF_POCKET,YES,NUMERIC,The total amount paid by the Person as a share of the expenses,
-PROCEDURE_COST,TOTAL_PAID,YES,NUMERIC,The total amount paid for the expenses of the Procedure.,
-PROCEDURE_COST,REVENUE_CODE_CONCEPT_ID,YES,INTEGER,A foreign key referring to a Standard Concept ID in the Standardized Vocabularies for Revenue codes.,
-PROCEDURE_COST,PAYER_PLAN_PERIOD_ID,YES,INTEGER,"A foreign key to the PAYER_PLAN_PERIOD table, where the details of the payer, plan and family are stored.",
-PROCEDURE_COST,REVENUE_CODE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Revenue code as it appears in the source data, stored here for reference.",
-VISIT_COST,VISIT_COST_ID,NO,INTEGER,A unique identifier for each procedure cost record.,
-VISIT_COST,VISIT_OCCURRENCE_ID,NO,INTEGER,A foreign key identifier to the procedure record for which cost data are recorded.,
-VISIT_COST,CURRENCY_CONCEPT_ID,YES,INTEGER,"A concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.",
-VISIT_COST,PAID_COPAY,YES,NUMERIC,The amount paid by the Person as a fixed contribution to the expenses. Copay does not contribute to the out_of_pocket expenses.,
-VISIT_COST,PAID_COINSURANCE,YES,NUMERIC,"The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the Health benefit Plan after the person's deductible is exceeded.",
-VISIT_COST,PAID_TOWARD_DEDUCTIBLE,YES,NUMERIC,The amount paid by the Person that is counted toward the deductible defined by the health benefit Plan.,
-VISIT_COST,PAID_BY_PAYER,YES,NUMERIC,"The amount paid by the Payer (insurer). If there is more than one Payer, several VISIT_COST records indicate that fact.",
-VISIT_COST,PAID_BY_COORDINATION_BENEFITS,YES,NUMERIC,The amount paid by a secondary Payer through the coordination of benefits.,
-VISIT_COST,TOTAL_OUT_OF_POCKET,YES,NUMERIC,"The total amount paid by the Person as a share of the expenses, excluding the copay.",
-VISIT_COST,TOTAL_PAID,YES,NUMERIC,The total amount paid for the expenses of the procedure.,
-VISIT_COST,PAYER_PLAN_PERIOD_ID,YES,INTEGER,"A foreign key to the PAYER_PLAN_PERIOD table, where the details of the Payer, Plan and Family are stored.",
-DRUG_COST,DRUG_COST_ID,NO,INTEGER,A unique identifier for each DRUG_COST record.,
-DRUG_COST,DRUG_EXPOSURE_ID,NO,INTEGER,A foreign key identifier to the Drug record for which cost data are recorded.,
-DRUG_COST,CURRENCY_CONCEPT_ID,YES,INTEGER,"A concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.",
-DRUG_COST,PAID_COPAY,YES,NUMERIC,The amount paid by the Person as a fixed contribution to the expenses. Copay does not contribute to the out of pocket expenses.,
-DRUG_COST,PAID_COINSURANCE,YES,NUMERIC,"The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the Payer Plan after the Person's deductible is exceeded.",
-DRUG_COST,PAID_TOWARD_DEDUCTIBLE,YES,NUMERIC,The amount paid by the Person that is counted toward the deductible defined by the Payer Plan.,
-DRUG_COST,PAID_BY_PAYER,YES,NUMERIC,"The amount paid by the Payer. If there is more than one Payer, several DRUG_COST records indicate that fact.",
-DRUG_COST,PAID_BY_COORDINATION_BENEFITS,YES,NUMERIC,The amount paid by a secondary Payer through the coordination of benefits.,
-DRUG_COST,TOTAL_OUT_OF_POCKET,YES,NUMERIC,The total amount paid by the Person as a share of the expenses.,
-DRUG_COST,TOTAL_PAID,YES,NUMERIC,The total amount paid for the expenses of drug exposure.,
-DRUG_COST,INGREDIENT_COST,YES,NUMERIC,"The portion of the drug expenses due to the cost charged by the manufacturer for the drug, typically a percentage of the Average Wholesale Price.",
-DRUG_COST,DISPENSING_FEE,YES,NUMERIC,"The portion of the drug expenses due to the dispensing fee charged by the pharmacy, typically a fixed amount.",
-DRUG_COST,AVERAGE_WHOLESALE_PRICE,YES,NUMERIC,List price of a Drug set by the manufacturer.,
-DRUG_COST,PAYER_PLAN_PERIOD_ID,YES,INTEGER,"A foreign key to the PAYER_PLAN_PERIOD table, where the details of the Payer, Plan and Family are stored.",
-PAYER_PLAN_PERIOD,PAYER_PLAN_PERIOD_ID,NO,INTEGER,"A identifier for each unique combination of payer, plan, family code and time span.",
-PAYER_PLAN_PERIOD,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person covered by the payer. The demographic details of that Person are stored in the PERSON table.,
-PAYER_PLAN_PERIOD,PAYER_PLAN_PERIOD_START_DATE,NO,DATE,The start date of the payer plan period.,
-PAYER_PLAN_PERIOD,PAYER_PLAN_PERIOD_END_DATE,NO,DATE,The end date of the payer plan period.,
-PAYER_PLAN_PERIOD,PAYER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the payer as it appears in the source data.,
-PAYER_PLAN_PERIOD,PLAN_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the Person's health benefit plan as it appears in the source data.,
-PAYER_PLAN_PERIOD,FAMILY_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the Person's family as it appears in the source data.,
-DEVICE_COST,DEVICE_COST_ID,NO,INTEGER,A unique identifier for each DEVICE_COST record.,
-DEVICE_COST,DEVICE_EXPOSURE_ID,NO,INTEGER,A foreign key identifier to the DEVICE_EXPOSURE record for which cost data are recorded.,
-DEVICE_COST,CURRENCY_CONCEPT_ID,YES,INTEGER,"A concept representing the 3-letter code used to delineate international currencies, such as USD for US Dollar.",
-DEVICE_COST,PAID_COPAY,YES,NUMERIC,The amount paid by the Person as a fixed contribution to the expenses. Copay does not contribute to the out_of_pocket expenses.,
-DEVICE_COST,PAID_COINSURANCE,YES,NUMERIC,"The amount paid by the Person as a joint assumption of risk. Typically, this is a percentage of the expenses defined by the Payer Plan after the person's deductible is exceeded.",
-DEVICE_COST,PAID_TOWARD_DEDUCTIBLE,YES,NUMERIC,The amount paid by the Person that is counted toward the deductible defined by the Payer Plan.,
-DEVICE_COST,PAID_BY_PAYER,YES,NUMERIC,"The amount paid by the Payer. If there is more than one payer, several procedure_cost records indicate that fact.",
-DEVICE_COST,PAID_BY_COORDINATION_BENEFITS,YES,NUMERIC,The amount paid by a secondary payer through the coordination of benefits.,
-DEVICE_COST,TOTAL_OUT_OF_POCKET,YES,NUMERIC,"The total amount paid by the Person as a share of the expenses, excluding the copay.",
-DEVICE_COST,TOTAL_PAID,YES,NUMERIC,The total amount paid for the expenses of the procedure.,
-DEVICE_COST,PAYER_PLAN_PERIOD_ID,YES,INTEGER,"A foreign key to the payer_plan_period table, where the details of the payer, plan and family are stored.",
-DRUG_ERA,DRUG_ERA_ID,NO,INTEGER,A unique identifier for each Drug Era.,
-DRUG_ERA,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is subjected to the Drug during the fDrug Era. The demographic details of that Person are stored in the PERSON table.,
-DRUG_ERA,DRUG_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the Ingredient Concept.,
-DRUG_ERA,DRUG_ERA_START_DATE,NO,DATE,The start date for the Drug Era constructed from the individual instances of Drug Exposures. It is the start date of the very first chronologically recorded instance of conutilization of a Drug.,
-DRUG_ERA,DRUG_ERA_END_DATE,NO,DATE,The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.,
-DRUG_ERA,DRUG_EXPOSURE_COUNT,YES,INTEGER,The number of individual Drug Exposure occurrences used to construct the Drug Era.,
-DRUG_ERA,GAP_DAYS,YES,INTEGER,The number of observed days of gap between Drug Exposure records which was tolerated in the building of the Drug Era record.,
-DOSE_ERA,DOSE_ERA_ID,NO,INTEGER,A unique identifier for each Dose Era.,
-DOSE_ERA,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is subjected to the drug during the drug era. The demographic details of that Person are stored in the PERSON table.,
-DOSE_ERA,DRUG_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the active Ingredient Concept.,
-DOSE_ERA,UNIT_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Concept identifier in the Standardized Vocabularies for the unit concept.,
-DOSE_ERA,DOSE_VALUE,NO,NUMERIC,The numeric value of the dose.,
-DOSE_ERA,DOSE_ERA_START_DATE,NO,DATE,The start date for the drug era constructed from the individual instances of drug exposures. It is the start date of the very first chronologically recorded instance of utilization of a drug.,
-DOSE_ERA,DOSE_ERA_END_DATE,NO,DATE,The end date for the drug era constructed from the individual instance of drug exposures. It is the end date of the final continuously recorded instance of utilization of a drug.,
-CONDITION_ERA,CONDITION_ERA_ID,NO,INTEGER,A unique identifier for each Condition Era.,
-CONDITION_ERA,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person who is experiencing the Condition during the Condition Era. The demographic details of that Person are stored in the PERSON table.,
-CONDITION_ERA,CONDITION_CONCEPT_ID,NO,INTEGER,A foreign key that refers to a standard Condition Concept identifier in the Standardized Vocabularies.,
-CONDITION_ERA,CONDITION_ERA_START_DATE,NO,DATE,The start date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the start date of the very first chronologically recorded instance of the condition.,
-CONDITION_ERA,CONDITION_ERA_END_DATE,NO,DATE,The end date for the Condition Era constructed from the individual instances of Condition Occurrences. It is the end date of the final continuously recorded instance of the Condition.,
-CONDITION_ERA,CONDITION_OCCURRENCE_COUNT,YES,INTEGER,The number of individual Condition Occurrences used to construct the condition era.,
-CDM_SOURCE,CDM_SOURCE_NAME,NO,CHARACTER VARYING,The full name of the source,
-CDM_SOURCE,CDM_SOURCE_ABBREVIATION,YES,CHARACTER VARYING,An abbreviation of the name,
-CDM_SOURCE,CDM_HOLDER,YES,CHARACTER VARYING,The name of the organization responsible for the development of the CDM instance,
-CDM_SOURCE,SOURCE_DESCRIPTION,YES,TEXT,A description of the source data origin and purpose for collection. The description may contain a summary of the period of time that is expected to be covered by this dataset.,
-CDM_SOURCE,SOURCE_DOCUMENTATION_REFERENCE,YES,CHARACTER VARYING,URL or other external reference to location of source documentation,
-CDM_SOURCE,CDM_ETL_REFERENCE,YES,CHARACTER VARYING,URL or other external reference to location of ETL specification documentation and ETL source code,
-CDM_SOURCE,SOURCE_RELEASE_DATE,YES,DATE,"The date for which the source data are most current, such as the last day of data capture",
-CDM_SOURCE,CDM_RELEASE_DATE,YES,DATE,The date when the CDM was instantiated,
-CDM_SOURCE,CDM_VERSION,YES,CHARACTER VARYING,The version of CDM used,
-CDM_SOURCE,VOCABULARY_VERSION,YES,CHARACTER VARYING,The version of the vocabulary used,
-COHORT,COHORT_DEFINITION_ID,NO,INTEGER,A foreign key to a record in the COHORT_DEFINITION table containing relevant Cohort Definition information.,
-COHORT,SUBJECT_ID,NO,INTEGER,"A foreign key to the subject in the cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.",
-COHORT,COHORT_START_DATE,NO,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit first match.",
-COHORT,COHORT_END_DATE,NO,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.",
-COHORT_DEFINITION,COHORT_DEFINITION_ID,NO,INTEGER,A unique identifier for each Cohort.,
-COHORT_DEFINITION,COHORT_DEFINITION_NAME,NO,CHARACTER VARYING,A short description of the Cohort.,
-COHORT_DEFINITION,COHORT_DEFINITION_DESCRIPTION,YES,TEXT,A complete description of the Cohort definition,
-COHORT_DEFINITION,DEFINITION_TYPE_CONCEPT_ID,NO,INTEGER,Type defining what kind of Cohort Definition the record represents and how the syntax may be executed,
-COHORT_DEFINITION,COHORT_DEFINITION_SYNTAX,YES,TEXT,Syntax or code to operationalize the Cohort definition,
-COHORT_DEFINITION,SUBJECT_CONCEPT_ID,NO,INTEGER,"A foreign key to the Concept to which defines the domain of subjects that are members of the cohort (e.g., Person, Provider, Visit).",
-COHORT_DEFINITION,COHORT_INSTANTIATION_DATE,YES,DATE,A date to indicate when the Cohort was instantiated in the COHORT table,
-COHORT_ATTRIBUTE,COHORT_DEFINITION_ID,NO,INTEGER,A foreign key to a record in the COHORT_DEFINITION table containing relevant Cohort Definition information.,
-COHORT_ATTRIBUTE,COHORT_START_DATE,NO,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit first match.",
-COHORT_ATTRIBUTE,COHORT_END_DATE,NO,DATE,"The date when the Cohort Definition criteria for the Person, Provider or Visit no longer match or the Cohort membership was terminated.",
-COHORT_ATTRIBUTE,SUBJECT_ID,NO,INTEGER,"A foreign key to the subject in the Cohort. These could be referring to records in the PERSON, PROVIDER, VISIT_OCCURRENCE table.",
-COHORT_ATTRIBUTE,ATTRIBUTE_DEFINITION_ID,NO,INTEGER,A foreign key to a record in the ATTRIBUTE_DEFINITIONtable containing relevant Attribute Definition information.,
-COHORT_ATTRIBUTE,VALUE_AS_NUMBER,YES,NUMERIC,The attribute result stored as a number. This is applicable to attributes where the result is expressed as a numeric value.,
-COHORT_ATTRIBUTE,VALUE_AS_CONCEPT_ID,YES,INTEGER,The attribute result stored as a Concept ID. This is applicable to attributes where the result is expressed as a categorical value.,
-ATTRIBUTE_DEFINITION,ATTRIBUTE_DEFINITION_ID,NO,INTEGER,A unique identifier for each Attribute.,
-ATTRIBUTE_DEFINITION,ATTRIBUTE_NAME,NO,CHARACTER VARYING,A short description of the Attribute.,
-ATTRIBUTE_DEFINITION,ATTRIBUTE_DESCRIPTION,YES,TEXT,A complete description of the Attribute definition,
-ATTRIBUTE_DEFINITION,ATTRIBUTE_TYPE_CONCEPT_ID,NO,INTEGER,Type defining what kind of Attribute Definition the record represents and how the syntax may be executed,
-ATTRIBUTE_DEFINITION,ATTRIBUTE_SYNTAX,YES,TEXT,Syntax or code to operationalize the Attribute definition,
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.0.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.0.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.0.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.0.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.1.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.1.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.1.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.1.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.csv
similarity index 99%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.csv
index ebd91f51..22cf3494 100644
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.0.csv
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.2.csv
@@ -21,6 +21,7 @@ STEM_TABLE,START_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATE
 STEM_TABLE,START_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATETIME
 STEM_TABLE,END_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATE
 STEM_TABLE,END_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATETIME
+STEM_TABLE,VERBATIM_END_DATE,DRUG_EXPOSURE,VERBATIM_END_DATE
 STEM_TABLE,TYPE_CONCEPT_ID,DRUG_EXPOSURE,DRUG_TYPE_CONCEPT_ID
 STEM_TABLE,STOP_REASON,DRUG_EXPOSURE,STOP_REASON
 STEM_TABLE,REFILLS,DRUG_EXPOSURE,REFILLS
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.csv
similarity index 98%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.csv
index bbe7031a..e290629e 100644
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.1.csv
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.csv
@@ -22,6 +22,7 @@ STEM_TABLE,START_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATE
 STEM_TABLE,START_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATETIME
 STEM_TABLE,END_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATE
 STEM_TABLE,END_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATETIME
+STEM_TABLE,VERBATIM_END_DATE,DRUG_EXPOSURE,VERBATIM_END_DATE
 STEM_TABLE,TYPE_CONCEPT_ID,DRUG_EXPOSURE,DRUG_TYPE_CONCEPT_ID
 STEM_TABLE,STOP_REASON,DRUG_EXPOSURE,STOP_REASON
 STEM_TABLE,REFILLS,DRUG_EXPOSURE,REFILLS
@@ -57,6 +58,7 @@ STEM_TABLE,ID,MEASUREMENT,MEASUREMENT_ID
 STEM_TABLE,CONCEPT_ID,MEASUREMENT,MEASUREMENT_CONCEPT_ID
 STEM_TABLE,START_DATE,MEASUREMENT,MEASUREMENT_DATE
 STEM_TABLE,START_DATETIME,MEASUREMENT,MEASUREMENT_DATETIME
+STEM_TABLE,MEASUREMENT_TIME,MEASUREMENT,MEASUREMENT_TIME
 STEM_TABLE,TYPE_CONCEPT_ID,MEASUREMENT,MEASUREMENT_TYPE_CONCEPT_ID
 STEM_TABLE,OPERATOR_CONCEPT_ID,MEASUREMENT,OPERATOR_CONCEPT_ID
 STEM_TABLE,VALUE_AS_NUMBER,MEASUREMENT,VALUE_AS_NUMBER
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.4.csv
similarity index 84%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.4.csv
index fb5ef707..00a53da5 100644
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.3.0.csv
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableDefaultMappingV5.4.csv
@@ -1,6 +1,7 @@
 SOURCE_TABLE,SOURCE_FIELD,TARGET_TABLE,TARGET_FIELD
 STEM_TABLE,PERSON_ID,CONDITION_OCCURRENCE,PERSON_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,CONDITION_OCCURRENCE,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,CONDITION_OCCURRENCE,VISIT_DETAIL_ID
 STEM_TABLE,PROVIDER_ID,CONDITION_OCCURRENCE,PROVIDER_ID
 STEM_TABLE,ID,CONDITION_OCCURRENCE,CONDITION_OCCURRENCE_ID
 STEM_TABLE,CONCEPT_ID,CONDITION_OCCURRENCE,CONDITION_CONCEPT_ID
@@ -21,6 +22,7 @@ STEM_TABLE,START_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATE
 STEM_TABLE,START_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_START_DATETIME
 STEM_TABLE,END_DATE,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATE
 STEM_TABLE,END_DATETIME,DRUG_EXPOSURE,DRUG_EXPOSURE_END_DATETIME
+STEM_TABLE,VERBATIM_END_DATE,DRUG_EXPOSURE,VERBATIM_END_DATE
 STEM_TABLE,TYPE_CONCEPT_ID,DRUG_EXPOSURE,DRUG_TYPE_CONCEPT_ID
 STEM_TABLE,STOP_REASON,DRUG_EXPOSURE,STOP_REASON
 STEM_TABLE,REFILLS,DRUG_EXPOSURE,REFILLS
@@ -31,6 +33,7 @@ STEM_TABLE,ROUTE_CONCEPT_ID,DRUG_EXPOSURE,ROUTE_CONCEPT_ID
 STEM_TABLE,LOT_NUMBER,DRUG_EXPOSURE,LOT_NUMBER
 STEM_TABLE,PROVIDER_ID,DRUG_EXPOSURE,PROVIDER_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,DRUG_EXPOSURE,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,DRUG_EXPOSURE,VISIT_DETAIL_ID
 STEM_TABLE,SOURCE_VALUE,DRUG_EXPOSURE,DRUG_SOURCE_VALUE
 STEM_TABLE,SOURCE_CONCEPT_ID,DRUG_EXPOSURE,DRUG_SOURCE_CONCEPT_ID
 STEM_TABLE,ROUTE_SOURCE_VALUE,DRUG_EXPOSURE,ROUTE_SOURCE_VALUE
@@ -44,16 +47,22 @@ STEM_TABLE,END_DATE,DEVICE_EXPOSURE,DEVICE_EXPOSURE_END_DATE
 STEM_TABLE,END_DATETIME,DEVICE_EXPOSURE,DEVICE_EXPOSURE_END_DATETIME
 STEM_TABLE,TYPE_CONCEPT_ID,DEVICE_EXPOSURE,DEVICE_TYPE_CONCEPT_ID
 STEM_TABLE,UNIQUE_DEVICE_ID,DEVICE_EXPOSURE,UNIQUE_DEVICE_ID
+STEM_TABLE,PRODUCTION_ID,DEVICE_EXPOSURE,PRODUCTION_ID
 STEM_TABLE,QUANTITY,DEVICE_EXPOSURE,QUANTITY
 STEM_TABLE,PROVIDER_ID,DEVICE_EXPOSURE,PROVIDER_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,DEVICE_EXPOSURE,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,DEVICE_EXPOSURE,VISIT_DETAIL_ID
 STEM_TABLE,SOURCE_VALUE,DEVICE_EXPOSURE,DEVICE_SOURCE_VALUE
 STEM_TABLE,SOURCE_CONCEPT_ID,DEVICE_EXPOSURE,DEVICE_SOURCE_CONCEPT_ID
+STEM_TABLE,UNIT_CONCEPT_ID,DEVICE_EXPOSURE,UNIT_CONCEPT_ID
+STEM_TABLE,UNIT_SOURCE_VALUE,DEVICE_EXPOSURE,UNIT_SOURCE_VALUE
+STEM_TABLE,UNIT_SOURCE_CONCEPT_ID,DEVICE_EXPOSURE,UNIT_SOURCE_CONCEPT_ID
 STEM_TABLE,PERSON_ID,MEASUREMENT,PERSON_ID
 STEM_TABLE,ID,MEASUREMENT,MEASUREMENT_ID
 STEM_TABLE,CONCEPT_ID,MEASUREMENT,MEASUREMENT_CONCEPT_ID
 STEM_TABLE,START_DATE,MEASUREMENT,MEASUREMENT_DATE
 STEM_TABLE,START_DATETIME,MEASUREMENT,MEASUREMENT_DATETIME
+STEM_TABLE,MEASUREMENT_TIME,MEASUREMENT,MEASUREMENT_TIME
 STEM_TABLE,TYPE_CONCEPT_ID,MEASUREMENT,MEASUREMENT_TYPE_CONCEPT_ID
 STEM_TABLE,OPERATOR_CONCEPT_ID,MEASUREMENT,OPERATOR_CONCEPT_ID
 STEM_TABLE,VALUE_AS_NUMBER,MEASUREMENT,VALUE_AS_NUMBER
@@ -63,10 +72,14 @@ STEM_TABLE,RANGE_LOW,MEASUREMENT,RANGE_LOW
 STEM_TABLE,RANGE_HIGH,MEASUREMENT,RANGE_HIGH
 STEM_TABLE,PROVIDER_ID,MEASUREMENT,PROVIDER_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,MEASUREMENT,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,MEASUREMENT,VISIT_DETAIL_ID
 STEM_TABLE,SOURCE_VALUE,MEASUREMENT,MEASUREMENT_SOURCE_VALUE
 STEM_TABLE,SOURCE_CONCEPT_ID,MEASUREMENT,MEASUREMENT_SOURCE_CONCEPT_ID
 STEM_TABLE,UNIT_SOURCE_VALUE,MEASUREMENT,UNIT_SOURCE_VALUE
+STEM_TABLE,UNIT_SOURCE_CONCEPT_ID,MEASUREMENT,UNIT_SOURCE_CONCEPT_ID
 STEM_TABLE,VALUE_SOURCE_VALUE,MEASUREMENT,VALUE_SOURCE_VALUE
+STEM_TABLE,EVENT_ID,MEASUREMENT,MEASUREMENT_EVENT_ID
+STEM_TABLE,EVENT_FIELD_CONCEPT_ID,MEASUREMENT,MEAS_EVENT_FIELD_CONCEPT_ID
 STEM_TABLE,PERSON_ID,OBSERVATION,PERSON_ID
 STEM_TABLE,ID,OBSERVATION,OBSERVATION_ID
 STEM_TABLE,CONCEPT_ID,OBSERVATION,OBSERVATION_CONCEPT_ID
@@ -75,25 +88,32 @@ STEM_TABLE,START_DATETIME,OBSERVATION,OBSERVATION_DATETIME
 STEM_TABLE,TYPE_CONCEPT_ID,OBSERVATION,OBSERVATION_TYPE_CONCEPT_ID
 STEM_TABLE,VALUE_AS_NUMBER,OBSERVATION,VALUE_AS_NUMBER
 STEM_TABLE,VALUE_AS_STRING,OBSERVATION,VALUE_AS_STRING
+STEM_TABLE,VALUE_SOURCE_VALUE,OBSERVATION,VALUE_SOURCE_VALUE
 STEM_TABLE,VALUE_AS_CONCEPT_ID,OBSERVATION,VALUE_AS_CONCEPT_ID
 STEM_TABLE,QUALIFIER_CONCEPT_ID,OBSERVATION,QUALIFIER_CONCEPT_ID
 STEM_TABLE,UNIT_CONCEPT_ID,OBSERVATION,UNIT_CONCEPT_ID
 STEM_TABLE,PROVIDER_ID,OBSERVATION,PROVIDER_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,OBSERVATION,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,OBSERVATION,VISIT_DETAIL_ID
 STEM_TABLE,SOURCE_VALUE,OBSERVATION,OBSERVATION_SOURCE_VALUE
 STEM_TABLE,SOURCE_CONCEPT_ID,OBSERVATION,OBSERVATION_SOURCE_CONCEPT_ID
 STEM_TABLE,UNIT_SOURCE_VALUE,OBSERVATION,UNIT_SOURCE_VALUE
 STEM_TABLE,QUALIFIER_SOURCE_VALUE,OBSERVATION,QUALIFIER_SOURCE_VALUE
+STEM_TABLE,EVENT_ID,OBSERVATION,OBSERVATION_EVENT_ID
+STEM_TABLE,EVENT_FIELD_CONCEPT_ID,OBSERVATION,OBS_EVENT_FIELD_CONCEPT_ID
 STEM_TABLE,PERSON_ID,PROCEDURE_OCCURRENCE,PERSON_ID
 STEM_TABLE,ID,PROCEDURE_OCCURRENCE,PROCEDURE_OCCURRENCE_ID
 STEM_TABLE,CONCEPT_ID,PROCEDURE_OCCURRENCE,PROCEDURE_CONCEPT_ID
 STEM_TABLE,START_DATE,PROCEDURE_OCCURRENCE,PROCEDURE_DATE
 STEM_TABLE,START_DATETIME,PROCEDURE_OCCURRENCE,PROCEDURE_DATETIME
+STEM_TABLE,END_DATE,PROCEDURE_OCCURRENCE,PROCEDURE_END_DATE
+STEM_TABLE,END_DATETIME,PROCEDURE_OCCURRENCE,PROCEDURE_END_DATETIME
 STEM_TABLE,TYPE_CONCEPT_ID,PROCEDURE_OCCURRENCE,PROCEDURE_TYPE_CONCEPT_ID
 STEM_TABLE,MODIFIER_CONCEPT_ID,PROCEDURE_OCCURRENCE,MODIFIER_CONCEPT_ID
 STEM_TABLE,QUANTITY,PROCEDURE_OCCURRENCE,QUANTITY
 STEM_TABLE,PROVIDER_ID,PROCEDURE_OCCURRENCE,PROVIDER_ID
 STEM_TABLE,VISIT_OCCURRENCE_ID,PROCEDURE_OCCURRENCE,VISIT_OCCURRENCE_ID
+STEM_TABLE,VISIT_DETAIL_ID,PROCEDURE_OCCURRENCE,VISIT_DETAIL_ID
 STEM_TABLE,SOURCE_VALUE,PROCEDURE_OCCURRENCE,PROCEDURE_SOURCE_VALUE
 STEM_TABLE,SOURCE_CONCEPT_ID,PROCEDURE_OCCURRENCE,PROCEDURE_SOURCE_CONCEPT_ID
 STEM_TABLE,MODIFIER_SOURCE_VALUE,PROCEDURE_OCCURRENCE,MODIFIER_SOURCE_VALUE
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.0.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.0.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.0.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.0.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.1.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.1.csv
similarity index 100%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.1.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.1.csv
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.csv
similarity index 95%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.0.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.csv
index af172f79..1d907313 100644
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.0.csv
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.2.csv
@@ -12,7 +12,7 @@ STEM_TABLE,START_DATE,NO,DATE,The start date of the event.
 STEM_TABLE,START_DATETIME,YES,DATETIME,The start datetime of the event.
 STEM_TABLE,END_DATE,YES,DATE,The end date of the event.
 STEM_TABLE,END_DATETIME,YES,DATETIME,The end datetime of the event.
-,VERBATIM_END_DATE,YES,DATE,The verbatim end date (not derived) of the event.
+STEM_TABLE,VERBATIM_END_DATE,YES,DATE,The verbatim end date (not derived) of the event.
 STEM_TABLE,DAYS_SUPPLY,YES,INTEGER,The number of days of supply of the medication as recorded in the original prescription or dispensing record.
 STEM_TABLE,DOSE_UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the dose unit as detailed in the source.
 STEM_TABLE,LOT_NUMBER,YES,CHARACTER VARYING,An identifier assigned to a particular quantity or lot of Drug product from the manufacturer.
@@ -26,7 +26,7 @@ STEM_TABLE,RANGE_LOW,YES,FLOAT,The lower limit of the normal range of the Measur
 STEM_TABLE,REFILLS,YES,INTEGER,"The number of refills after the initial prescription. The initial prescription is not counted, values start with 0."
 STEM_TABLE,ROUTE_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration.
 STEM_TABLE,ROUTE_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the route of administration as detailed in the source.
-STEM_TABLE,SIG,YES,CHARACTER VARYING,The directions (“signetur”) on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.
+STEM_TABLE,SIG,YES,CHARACTER VARYING,The directions (�signetur�) on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.
 STEM_TABLE,STOP_REASON,YES,CHARACTER VARYING,"The reason that the condition was no longer present or the drug exposure stopped, as indicated in the source data."
 STEM_TABLE,UNIQUE_DEVICE_ID,YES,CHARACTER VARYING,A UDI or equivalent identifying the instance of the Device used in the Person.
 STEM_TABLE,UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the unit the effective_drug_dose/measurement/observation/specimen value is expressed.
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.0.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.0.csv
deleted file mode 100644
index 987f7cf5..00000000
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.0.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-TABLE_NAME,COLUMN_NAME,IS_NULLABLE,DATA_TYPE,DESCRIPTION
-STEM_TABLE,DOMAIN_ID,NO,CHARACTER VARYING,A foreign key idenfifying the domain this event belongs to. The domain drives the target CDM table this event will be recorded in.  If one is not set specify a default domain.
-STEM_TABLE,PERSON_ID,NO,INTEGER,A foreign key identifier to the Person. The demographic details of that Person are stored in the PERSON table.
-STEM_TABLE,VISIT_OCCURRENCE_ID,YES,INTEGER,A foreign key to the visit in the VISIT table.
-STEM_TABLE,PROVIDER_ID,YES,INTEGER,A foreign key to the Provider in the PROVIDER table who was responsible for capturing this event.
-STEM_TABLE,ID,NO,INTEGER,A unique identifier for identifying the event.
-STEM_TABLE,CONCEPT_ID,NO,INTEGER,A foreign key that refers to a Standard Condition Concept identifier in the Standardized Vocabularies.
-STEM_TABLE,SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the Concept as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference.
-STEM_TABLE,SOURCE_CONCEPT_ID,YES,INTEGER,A foreign key to a Concept that refers to the code used in the source.
-STEM_TABLE,TYPE_CONCEPT_ID,NO,INTEGER,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the event was recorded, the level of standardization, and the type of occurrence."
-STEM_TABLE,START_DATE,NO,DATE,The start date of the event.
-STEM_TABLE,START_DATETIME,YES,DATETIME,The start datetime of the event.
-STEM_TABLE,END_DATE,YES,DATE,The end date of the event.
-STEM_TABLE,END_DATETIME,YES,DATETIME,The end datetime of the event.
-,VERBATIM_END_DATE,YES,DATE,The verbatim end date (not derived) of the event.
-STEM_TABLE,DAYS_SUPPLY,YES,INTEGER,The number of days of supply of the medication as recorded in the original prescription or dispensing record.
-STEM_TABLE,DOSE_UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the dose unit as detailed in the source.
-STEM_TABLE,LOT_NUMBER,YES,CHARACTER VARYING,An identifier assigned to a particular quantity or lot of Drug product from the manufacturer.
-STEM_TABLE,MODIFIER_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for a modifier (e.g. bilateral)
-STEM_TABLE,MODIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the modifier as it appears in the source data.
-STEM_TABLE,OPERATOR_CONCEPT_ID,YES,INTEGER,"A foreign key identifier to the predefined Concept in the Standardized Vocabularies reflecting the mathematical operator that is applied to the value_as_number. Operators are <, ?, =, ?, >."
-STEM_TABLE,MODIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the modifier as it appears in the source data.
-STEM_TABLE,QUANTITY,YES,INTEGER,The number of individual Devices/Procedures/Drugs used for the exposure.
-STEM_TABLE,RANGE_HIGH,YES,FLOAT,The upper limit of the normal range of the Measurement. The upper range is assumed to be of the same unit of measure as the Measurement value.
-STEM_TABLE,RANGE_LOW,YES,FLOAT,The lower limit of the normal range of the Measurement result. The lower range is assumed to be of the same unit of measure as the Measurement value.
-STEM_TABLE,REFILLS,YES,INTEGER,"The number of refills after the initial prescription. The initial prescription is not counted, values start with 0."
-STEM_TABLE,ROUTE_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration.
-STEM_TABLE,ROUTE_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the route of administration as detailed in the source.
-STEM_TABLE,SIG,YES,CHARACTER VARYING,The directions (�signetur�) on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record.
-STEM_TABLE,STOP_REASON,YES,CHARACTER VARYING,"The reason that the condition was no longer present or the drug exposure stopped, as indicated in the source data."
-STEM_TABLE,UNIQUE_DEVICE_ID,YES,CHARACTER VARYING,A UDI or equivalent identifying the instance of the Device used in the Person.
-STEM_TABLE,UNIT_CONCEPT_ID,YES,INTEGER,A foreign key to a predefined concept in the Standardized Vocabularies reflecting the unit the effective_drug_dose/measurement/observation/specimen value is expressed.
-STEM_TABLE,UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is stored here for reference.
-STEM_TABLE,VALUE_AS_CONCEPT_ID,YES,INTEGER,"A foreign key to a result represented as a Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.)."
-STEM_TABLE,VALUE_AS_NUMBER,YES,DECIMAL,A result where the result is expressed as a numeric value.
-STEM_TABLE,VALUE_AS_STRING,YES,CHARACTER VARYING,The result stored as a string. This is applicable where the result is expressed as verbatim text.
-STEM_TABLE,VALUE_SOURCE_VALUE,YES,CHARACTER VARYING,The source value associated with the content of the value_as_number or value_as_concept as stored in the source data.
-STEM_TABLE,ANATOMIC_SITE_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for the anatomic location of specimen collection.
-STEM_TABLE,DISEASE_STATUS_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for the Disease Status of specimen collection.
-STEM_TABLE,SPECIMEN_SOURCE_ID,YES,INTEGER,The Specimen identifier as it appears in the source data.
-STEM_TABLE,ANATOMIC_SITE_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the anatomic site as detailed in the source.
-STEM_TABLE,DISEASE_STATUS_SOURCE_VALUE,YES,CHARACTER VARYING,The information about the disease status as detailed in the source.
-STEM_TABLE,CONDITION_STATUS_CONCEPT_ID,YES,CHARACTER VARYING,A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the condition_status.
-STEM_TABLE,CONDITION_STATUS_SOURCE_VALUE,YES,INTEGER,The source code as it appears in the source data
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.1.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.csv
similarity index 98%
rename from rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.1.csv
rename to rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.csv
index 1e01d67d..4c6d6b18 100644
--- a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.1.csv
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.3.csv
@@ -44,3 +44,4 @@ STEM_TABLE,CONDITION_STATUS_CONCEPT_ID,YES,CHARACTER VARYING,"A foreign key to t
 STEM_TABLE,CONDITION_STATUS_SOURCE_VALUE,YES,INTEGER,"The source code as it appears in the source data"
 STEM_TABLE,QUALIFIER_CONCEPT_ID,YES,INTEGER,"A foreign key to a Standard Concept ID for a qualifier (e.g., severity of drug-drug interaction alert)"
 STEM_TABLE,QUALIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,"The source value associated with a qualifier to characterize the observation"
+STEM_TABLE,MEASUREMENT_TIME,YES,CHARACTER VARYING,"The time of the Measurement."
\ No newline at end of file
diff --git a/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.4.csv b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.4.csv
new file mode 100644
index 00000000..75776296
--- /dev/null
+++ b/rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/StemTableV5.4.csv
@@ -0,0 +1,51 @@
+TABLE_NAME,COLUMN_NAME,IS_NULLABLE,DATA_TYPE,DESCRIPTION
+STEM_TABLE,DOMAIN_ID,NO,CHARACTER VARYING,"A foreign key idenfifying the domain this event belongs to. The domain drives the target CDM table this event will be recorded in.  If one is not set specify a default domain."
+STEM_TABLE,ID,NO,INTEGER,"A unique identifier for identifying the event."
+STEM_TABLE,PERSON_ID,NO,INTEGER,"A foreign key identifier to the Person. The demographic details of that Person are stored in the PERSON table."
+STEM_TABLE,CONCEPT_ID,NO,INTEGER,"A foreign key that refers to a Standard Condition Concept identifier in the Standardized Vocabularies."
+STEM_TABLE,START_DATE,NO,DATE,"The start date of the event."
+STEM_TABLE,START_DATETIME,YES,DATETIME,"The start datetime of the event."
+STEM_TABLE,END_DATE,YES,DATE,"The end date of the event."
+STEM_TABLE,END_DATETIME,YES,DATETIME,"The end datetime of the event."
+STEM_TABLE,TYPE_CONCEPT_ID,NO,INTEGER,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the source data from which the event was recorded, the level of standardization, and the type of occurrence."
+STEM_TABLE,PROVIDER_ID,YES,INTEGER,"A foreign key to the Provider in the PROVIDER table who was responsible for capturing this event."
+STEM_TABLE,VISIT_OCCURRENCE_ID,YES,INTEGER,"A foreign key to the visit in the VISIT table."
+STEM_TABLE,VISIT_DETAIL_ID,YES,INTEGER,"A foreign key to the visit detail in the VISIT_DETAIL table."
+STEM_TABLE,SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the Concept as it appears in the source data. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference."
+STEM_TABLE,SOURCE_CONCEPT_ID,YES,INTEGER,"A foreign key to a Concept that refers to the code used in the source."
+STEM_TABLE,VALUE_AS_NUMBER,YES,DECIMAL,"A result where the result is expressed as a numeric value."
+STEM_TABLE,VALUE_AS_STRING,YES,CHARACTER VARYING,"The result stored as a string. This is applicable where the result is expressed as verbatim text."
+STEM_TABLE,VALUE_AS_CONCEPT_ID,YES,INTEGER,"A foreign key to a result represented as a Concept from the Standardized Vocabularies (e.g., positive/negative, present/absent, low/high, etc.)."
+STEM_TABLE,UNIT_CONCEPT_ID,YES,INTEGER,"A foreign key to a predefined concept in the Standardized Vocabularies reflecting the unit the effective_drug_dose/measurement/observation/specimen value is expressed."
+STEM_TABLE,VALUE_SOURCE_VALUE,YES,CHARACTER VARYING,"The source value associated with the content of the value_as_number or value_as_concept as stored in the source data."
+STEM_TABLE,UNIT_SOURCE_CONCEPT_ID,YES,INTEGER,"A foreign key to a Concept that refers to the code used in the source for the unit."
+STEM_TABLE,UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,"The source code for the unit as it appears in the source data. This code is mapped to a standard unit concept in the Standardized Vocabularies and the original code is stored here for reference."
+STEM_TABLE,VERBATIM_END_DATE,YES,DATE,"The verbatim end date (not derived) of the event."
+STEM_TABLE,DAYS_SUPPLY,YES,INTEGER,"The number of days of supply of the medication as recorded in the original prescription or dispensing record."
+STEM_TABLE,DOSE_UNIT_SOURCE_VALUE,YES,CHARACTER VARYING,"The information about the dose unit as detailed in the source."
+STEM_TABLE,MODIFIER_CONCEPT_ID,YES,INTEGER,A foreign key to a Standard Concept identifier for a modifier (e.g. bilateral)
+STEM_TABLE,MODIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,The source code for the modifier as it appears in the source data.
+STEM_TABLE,MEASUREMENT_TIME,YES,CHARACTER VARYING,"The time of the Measurement. This is present for backwards compatibility and will be deprecated in an upcoming version"
+STEM_TABLE,OPERATOR_CONCEPT_ID,YES,INTEGER,"A foreign key identifier to the predefined Concept in the Standardized Vocabularies reflecting the mathematical operator that is applied to the value_as_number. Operators are <, ?, =, ?, >."
+STEM_TABLE,QUANTITY,YES,INTEGER,"The number of individual Devices/Procedures/Drugs used for the exposure."
+STEM_TABLE,RANGE_LOW,YES,FLOAT,"The lower limit of the normal range of the Measurement result. The lower range is assumed to be of the same unit of measure as the Measurement value."
+STEM_TABLE,RANGE_HIGH,YES,FLOAT,"The upper limit of the normal range of the Measurement. The upper range is assumed to be of the same unit of measure as the Measurement value."
+STEM_TABLE,STOP_REASON,YES,CHARACTER VARYING,"The reason that the condition was no longer present or the drug exposure stopped, as indicated in the source data."
+STEM_TABLE,REFILLS,YES,INTEGER,"The number of refills after the initial prescription. The initial prescription is not counted, values start with 0."
+STEM_TABLE,SIG,YES,CHARACTER VARYING,"The directions (�signetur�) on the Drug prescription as recorded in the original prescription (and printed on the container) or dispensing record."
+STEM_TABLE,ROUTE_CONCEPT_ID,YES,INTEGER,"A foreign key to a predefined concept in the Standardized Vocabularies reflecting the route of administration."
+STEM_TABLE,ROUTE_SOURCE_VALUE,YES,CHARACTER VARYING,"The information about the route of administration as detailed in the source."
+STEM_TABLE,LOT_NUMBER,YES,CHARACTER VARYING,"An identifier assigned to a particular quantity or lot of Drug product from the manufacturer."
+STEM_TABLE,UNIQUE_DEVICE_ID,YES,CHARACTER VARYING,"A UDI or equivalent identifying the instance of the Device used in the Person."
+STEM_TABLE,PRODUCTION_ID,YES,CHARACTER VARYING,"This is the Production Identifier (UDI-PI) portion of the Unique Device Identification."
+STEM_TABLE,ANATOMIC_SITE_CONCEPT_ID,YES,INTEGER,"A foreign key to a Standard Concept identifier for the anatomic location of specimen collection."
+STEM_TABLE,DISEASE_STATUS_CONCEPT_ID,YES,INTEGER,"A foreign key to a Standard Concept identifier for the Disease Status of specimen collection."
+STEM_TABLE,SPECIMEN_SOURCE_ID,YES,INTEGER,"The Specimen identifier as it appears in the source data."
+STEM_TABLE,ANATOMIC_SITE_SOURCE_VALUE,YES,CHARACTER VARYING,"The information about the anatomic site as detailed in the source."
+STEM_TABLE,DISEASE_STATUS_SOURCE_VALUE,YES,CHARACTER VARYING,"The information about the disease status as detailed in the source."
+STEM_TABLE,CONDITION_STATUS_CONCEPT_ID,YES,CHARACTER VARYING,"A foreign key to the predefined Concept identifier in the Standardized Vocabularies reflecting the condition_status."
+STEM_TABLE,CONDITION_STATUS_SOURCE_VALUE,YES,INTEGER,"The source code as it appears in the source data"
+STEM_TABLE,QUALIFIER_CONCEPT_ID,YES,INTEGER,"A foreign key to a Standard Concept ID for a qualifier (e.g., severity of drug-drug interaction alert)"
+STEM_TABLE,QUALIFIER_SOURCE_VALUE,YES,CHARACTER VARYING,"The source value associated with a qualifier to characterize the observation"
+STEM_TABLE,EVENT_ID,YES,INTEGER,"If the record is related to another record in the database, this field is the primary key of the linked record."
+STEM_TABLE,EVENT_FIELD_CONCEPT_ID,YES,INTEGER,"If the record is related to another record in the database, this field is the CONCEPT_ID that identifies which table the primary key of the linked record came from."
diff --git a/whiterabbit/pom.xml b/whiterabbit/pom.xml
index 2335dd86..89eed020 100644
--- a/whiterabbit/pom.xml
+++ b/whiterabbit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.3</version>
+        <version>0.10.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.21</version>
+            <version>1.7.30</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java b/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
index e17d391a..8c4b084c 100644
--- a/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
+++ b/whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
@@ -818,7 +818,7 @@ private DbSettings getSourceDbSettings() {
 						JOptionPane.ERROR_MESSAGE);
 				return null;
 			}
-			if (sourceDelimiterField.getText().toLowerCase().equals("tab"))
+			if (sourceDelimiterField.getText().equalsIgnoreCase("tab"))
 				dbSettings.delimiter = '\t';
 			else
 				dbSettings.delimiter = sourceDelimiterField.getText().charAt(0);
@@ -849,7 +849,7 @@ else if (sourceType.getSelectedItem().toString().equals("SQL Server")) {
 						dbSettings.domain = parts[0];
 					}
 				}
-			} if (sourceType.getSelectedItem().toString().equals("PDW")) {
+			} else if (sourceType.getSelectedItem().toString().equals("PDW")) {
 				dbSettings.dbType = DbType.PDW;
 				if (sourceUserField.getText().length() != 0) { // Not using windows authentication
 					String[] parts = sourceUserField.getText().split("/");
@@ -921,13 +921,10 @@ private DbSettings getTargetDbSettings() {
 		if (targetType.getSelectedItem().equals("Delimited text files")) {
 			dbSettings.sourceType = DbSettings.SourceType.CSV_FILES;
 
-			switch((String) targetCSVFormat.getSelectedItem()) {
+			switch(targetCSVFormat.getSelectedItem().toString()) {
 				case "Default (comma, CRLF)":
 					dbSettings.csvFormat = CSVFormat.DEFAULT;
 					break;
-				case "RFC4180":
-					dbSettings.csvFormat = CSVFormat.RFC4180;
-					break;
 				case "Excel CSV":
 					dbSettings.csvFormat = CSVFormat.EXCEL;
 					break;
@@ -940,7 +937,6 @@ private DbSettings getTargetDbSettings() {
 				default:
 					dbSettings.csvFormat = CSVFormat.RFC4180;
 			}
-
 		} else {
 			dbSettings.sourceType = DbSettings.SourceType.DATABASE;
 			dbSettings.user = targetUserField.getText();
@@ -1089,12 +1085,12 @@ public void run() {
 		}
 	}
 
-	private class DBTableSelectionDialog extends JDialog implements ActionListener {
+	private static class DBTableSelectionDialog extends JDialog implements ActionListener {
 		private static final long	serialVersionUID	= 4527207331482143091L;
-		private JButton				yesButton			= null;
-		private JButton				noButton			= null;
+		private final JButton				yesButton;
+		private final JButton				noButton;
 		private boolean				answer				= false;
-		private JList<String>		list;
+		private final JList<String>		list;
 
 		public boolean getAnswer() {
 			return answer;
@@ -1112,7 +1108,7 @@ public DBTableSelectionDialog(JFrame frame, boolean modal, String tableNames) {
 			JLabel message = new JLabel("Select tables");
 			panel.add(message, BorderLayout.NORTH);
 
-			list = new JList<String>(tableNames.split("\t"));
+			list = new JList<>(tableNames.split("\t"));
 			JScrollPane scrollPane = new JScrollPane(list);
 			panel.add(scrollPane, BorderLayout.CENTER);
 
@@ -1147,11 +1143,8 @@ public List<String> getSelectedItems() {
 
 	@Override
 	public void actionPerformed(ActionEvent event) {
-		switch (event.getActionCommand()) {
-			case ACTION_CMD_HELP:
-				doOpenDocumentation();
-				break;
-
+		if (ACTION_CMD_HELP.equals(event.getActionCommand())) {
+			doOpenDocumentation();
 		}
 	}