diff --git a/VAR.DatabaseExplorer/Code/DataAccess/ProcedureDA.cs b/VAR.DatabaseExplorer/Code/DataAccess/ProcedureDA.cs
index 72ba3c9..2f2e7f3 100644
--- a/VAR.DatabaseExplorer/Code/DataAccess/ProcedureDA.cs
+++ b/VAR.DatabaseExplorer/Code/DataAccess/ProcedureDA.cs
@@ -35,13 +35,26 @@ namespace VAR.DatabaseExplorer.Code.DataAccess
             return procedures;
         }
 
+        private static bool SupportedSqlServerVersion(string serverVersion)
+        {
+            return
+                serverVersion.StartsWith("10.") ||
+                serverVersion.StartsWith("11.") ||
+                serverVersion.StartsWith("12.") ||
+                serverVersion.StartsWith("13.") ||
+                serverVersion.StartsWith("14.") ||
+                serverVersion.StartsWith("15.") ||
+                serverVersion.StartsWith("16.") ||
+                false;
+        }
+
         public static string GetProcedureDefinition(string connectionString, string schema, string name)
         {
             SqlDataAdapter dataAdapter;
             var cnx = new SqlConnection(connectionString);
             cnx.Open();
 
-            if (cnx.ServerVersion.StartsWith("10.") || cnx.ServerVersion.StartsWith("11.") || cnx.ServerVersion.StartsWith("13.") || cnx.ServerVersion.StartsWith("14."))
+            if (SupportedSqlServerVersion(cnx.ServerVersion))
             {
                 dataAdapter = new SqlDataAdapter(@"
                     SELECT
@@ -88,7 +101,7 @@ namespace VAR.DatabaseExplorer.Code.DataAccess
             var cnx = new SqlConnection(connectionString);
             cnx.Open();
 
-            if (cnx.ServerVersion.StartsWith("10.") || cnx.ServerVersion.StartsWith("11.") || cnx.ServerVersion.StartsWith("13.") || cnx.ServerVersion.StartsWith("14."))
+            if (SupportedSqlServerVersion(cnx.ServerVersion))
             {
                 dataAdapter = new SqlDataAdapter(@"
                     SELECT
diff --git a/VAR.DatabaseExplorer/Code/DataAccess/TableDA.cs b/VAR.DatabaseExplorer/Code/DataAccess/TableDA.cs
index 6e12b2e..533965a 100644
--- a/VAR.DatabaseExplorer/Code/DataAccess/TableDA.cs
+++ b/VAR.DatabaseExplorer/Code/DataAccess/TableDA.cs
@@ -34,13 +34,26 @@ namespace VAR.DatabaseExplorer.Code.DataAccess
             return tables;
         }
 
+        private static bool SupportedSqlServerVersion(string serverVersion)
+        {
+            return
+                serverVersion.StartsWith("10.") ||
+                serverVersion.StartsWith("11.") ||
+                serverVersion.StartsWith("12.") ||
+                serverVersion.StartsWith("13.") ||
+                serverVersion.StartsWith("14.") ||
+                serverVersion.StartsWith("15.") ||
+                serverVersion.StartsWith("16.") ||
+                false;
+        }
+
         public static List<ViewDefinition> GetViewDefinitions(string connectionString, string schema = null, string name = null)
         {
             SqlDataAdapter dataAdapter;
             var cnx = new SqlConnection(connectionString);
             cnx.Open();
 
-            if (cnx.ServerVersion.StartsWith("10.") || cnx.ServerVersion.StartsWith("11.") || cnx.ServerVersion.StartsWith("13.") || cnx.ServerVersion.StartsWith("14."))
+            if (SupportedSqlServerVersion(cnx.ServerVersion))
             {
                 dataAdapter = new SqlDataAdapter(@"
                     SELECT