diff --git a/.gitignore b/.gitignore
index 92b877e..2f6c3fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ Gemfile.lock
 
 # ByeBug history
 .byebug_history
+.DS_Store
+.tool-versions
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 00f42ac..91408f0 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -45,7 +45,7 @@ files_changed = files_changed.select { |filename| File.file?(filename) }
 # puts files_changed
 # puts '----------------------------------------------------------------------'
 
-unless files_changed.length.zero?
+unless files_changed.empty?
   # puts "#{keywords.join('|')}"
   # puts "#{files_changed.join(' ')}"
 
diff --git a/hooks/update-version b/hooks/update-version
index 406194a..a0427fa 100755
--- a/hooks/update-version
+++ b/hooks/update-version
@@ -19,7 +19,7 @@ namespaces.each do |namespace|
   indent += 1
 end
 
-output.push "#{'  ' * indent}VERSION = \'#{version}'"
+output.push "#{'  ' * indent}VERSION = '#{version}'"
 indent -= 1
 
 namespaces.each do
diff --git a/k_manager.gemspec b/k_manager.gemspec
index 60fa2ee..aaf1f1a 100644
--- a/k_manager.gemspec
+++ b/k_manager.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cmdlet', '~> 0'
   spec.add_dependency 'drawio_dsl', '~> 0.1'
   spec.add_dependency 'dry-struct', '~> 1'
-  spec.add_dependency 'filewatcher', '~> 2.0.0.beta5'
+  spec.add_dependency 'filewatcher', '~> 2.1.0'
   spec.add_dependency 'k_builder', '~> 0.0.0'
   spec.add_dependency 'k_director', '~> 0.1'
   spec.add_dependency 'k_doc', '~> 0.0.0'
@@ -53,6 +53,6 @@ Gem::Specification.new do |spec|
 
   # spec.add_dependency 'k_type'                , '~> 0.0.0'
   # spec.add_dependency 'k_util'                , '~> 0.0.0'
-  spec.add_dependency 'dry-cli', '~> 0.7.0'
+  spec.add_dependency 'dry-cli', '~> 1.0.0'
   spec.add_dependency 'tailwind_dsl'
 end
diff --git a/lib/k_manager/resources/file_resources/ruby_file_resource.rb b/lib/k_manager/resources/file_resources/ruby_file_resource.rb
index 9a8887a..81c5774 100644
--- a/lib/k_manager/resources/file_resources/ruby_file_resource.rb
+++ b/lib/k_manager/resources/file_resources/ruby_file_resource.rb
@@ -25,7 +25,7 @@ def register_document
 
         # A regular ruby file would not add resource_documents
         # so create one manually
-        @document = super if documents.length.zero?
+        @document = super if documents.empty?
       end
     end
   end
diff --git a/spec/k_manager/scenarios/dumps/manager_spec.documents.json b/spec/k_manager/scenarios/dumps/manager_spec.documents.json
index 4ebdbb3..0033ecb 100644
--- a/spec/k_manager/scenarios/dumps/manager_spec.documents.json
+++ b/spec/k_manager/scenarios/dumps/manager_spec.documents.json
@@ -4,7 +4,7 @@
     "area_namespace": "xmen",
     "area_resource_count": 2,
     "area_document_count": 2,
-    "resource_id": 13740,
+    "resource_id": 12700,
     "resource_key": "countries",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -21,7 +21,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/countries.csv",
     "resource_relative_path": "spec/k_manager/scenarios/simple/countries.csv",
     "resource_exist": true,
-    "document_id": 14000,
+    "document_id": 12960,
     "document_state": "children_evaluated",
     "document_data": [
       {
@@ -61,7 +61,7 @@
     "area_namespace": "xmen",
     "area_resource_count": 2,
     "area_document_count": 2,
-    "resource_id": 13760,
+    "resource_id": 12720,
     "resource_key": "traveling_people",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -78,7 +78,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/traveling-people.json",
     "resource_relative_path": "spec/k_manager/scenarios/simple/traveling-people.json",
     "resource_exist": true,
-    "document_id": 14020,
+    "document_id": 12980,
     "document_state": "children_evaluated",
     "document_data": {
       "people": [
@@ -133,7 +133,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13780,
+    "resource_id": 12740,
     "resource_key": "countries",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -150,7 +150,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/countries.csv",
     "resource_relative_path": "spec/k_manager/scenarios/simple/countries.csv",
     "resource_exist": true,
-    "document_id": 14040,
+    "document_id": 13000,
     "document_state": "children_evaluated",
     "document_data": [
       {
@@ -190,7 +190,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13800,
+    "resource_id": 12760,
     "resource_key": "traveling_people",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -207,7 +207,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/traveling-people.json",
     "resource_relative_path": "spec/k_manager/scenarios/simple/traveling-people.json",
     "resource_exist": true,
-    "document_id": 14060,
+    "document_id": 13020,
     "document_state": "children_evaluated",
     "document_data": {
       "people": [
@@ -262,7 +262,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13820,
+    "resource_id": 12780,
     "resource_key": "ben_dover",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -279,7 +279,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/ben-dover.jason",
     "resource_relative_path": "spec/k_manager/scenarios/simple/ben-dover.jason",
     "resource_exist": true,
-    "document_id": 14080,
+    "document_id": 13040,
     "document_state": "children_evaluated",
     "document_data": {
       "first": "Ben",
@@ -307,7 +307,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13920,
+    "resource_id": 12880,
     "resource_key": "rich_data",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -324,7 +324,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_relative_path": "spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_exist": true,
-    "document_id": 14100,
+    "document_id": 13060,
     "document_state": "children_evaluated",
     "document_data": [
       {
@@ -364,7 +364,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13920,
+    "resource_id": 12880,
     "resource_key": "rich_data",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -381,7 +381,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_relative_path": "spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_exist": true,
-    "document_id": 14120,
+    "document_id": 13080,
     "document_state": "children_evaluated",
     "document_data": {
       "people": [
@@ -436,7 +436,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13920,
+    "resource_id": 12880,
     "resource_key": "rich_data",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -453,7 +453,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_relative_path": "spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_exist": true,
-    "document_id": 14140,
+    "document_id": 13100,
     "document_state": "children_evaluated",
     "document_data": {
     },
@@ -473,7 +473,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13920,
+    "resource_id": 12880,
     "resource_key": "rich_data",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -490,7 +490,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_relative_path": "spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_exist": true,
-    "document_id": 14160,
+    "document_id": 13120,
     "document_state": "children_evaluated",
     "document_data": {
       "settings": {
@@ -514,7 +514,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13920,
+    "resource_id": 12880,
     "resource_key": "rich_data",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -531,7 +531,7 @@
     "resource_path": "/Users/davidcruwys/dev/kgems/k_manager/spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_relative_path": "spec/k_manager/scenarios/simple/rich_data.rb",
     "resource_exist": true,
-    "document_id": 14180,
+    "document_id": 13140,
     "document_state": "children_evaluated",
     "document_data": {
       "users": {
@@ -589,7 +589,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13940,
+    "resource_id": 12900,
     "resource_key": "people_csv",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -606,7 +606,7 @@
     "resource_path": "https://gist.githubusercontent.com/klueless-io/36a53ac9683866d923ce9fa99ccca436/raw/people.csv",
     "resource_relative_path": "/klueless-io/36a53ac9683866d923ce9fa99ccca436/raw/people.csv",
     "resource_exist": true,
-    "document_id": 14200,
+    "document_id": 13160,
     "document_state": "children_evaluated",
     "document_data": [
       {
@@ -636,7 +636,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13960,
+    "resource_id": 12920,
     "resource_key": "site_definition_rb",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -653,7 +653,7 @@
     "resource_path": "https://gist.githubusercontent.com/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_relative_path": "/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_exist": true,
-    "document_id": 14220,
+    "document_id": 13180,
     "document_state": "children_evaluated",
     "document_data": {
       "settings": {
@@ -676,7 +676,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13960,
+    "resource_id": 12920,
     "resource_key": "site_definition_rb",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -693,7 +693,7 @@
     "resource_path": "https://gist.githubusercontent.com/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_relative_path": "/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_exist": true,
-    "document_id": 14240,
+    "document_id": 13200,
     "document_state": "children_evaluated",
     "document_data": {
       "settings": {
@@ -716,7 +716,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "resource_id": 13960,
+    "resource_id": 12920,
     "resource_key": "site_definition_rb",
     "resource_namespace": null,
     "resource_status": "documents_loaded",
@@ -733,7 +733,7 @@
     "resource_path": "https://gist.githubusercontent.com/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_relative_path": "/klueless-io/32397b82f2ba607ce3dc452dcb357a99/raw/site_definition.rb",
     "resource_exist": true,
-    "document_id": 14260,
+    "document_id": 13220,
     "document_state": "children_evaluated",
     "document_data": {
       "table": {
diff --git a/spec/k_manager/scenarios/dumps/manager_spec.resources.json b/spec/k_manager/scenarios/dumps/manager_spec.resources.json
index b52f711..ac6e811 100644
--- a/spec/k_manager/scenarios/dumps/manager_spec.resources.json
+++ b/spec/k_manager/scenarios/dumps/manager_spec.resources.json
@@ -4,7 +4,7 @@
     "area_namespace": "xmen",
     "area_resource_count": 2,
     "area_document_count": 2,
-    "id": 13740,
+    "id": 12700,
     "key": "countries",
     "namespace": null,
     "status": "documents_loaded",
@@ -27,7 +27,7 @@
     "area_namespace": "xmen",
     "area_resource_count": 2,
     "area_document_count": 2,
-    "id": 13760,
+    "id": 12720,
     "key": "traveling_people",
     "namespace": null,
     "status": "documents_loaded",
@@ -50,7 +50,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13780,
+    "id": 12740,
     "key": "countries",
     "namespace": null,
     "status": "documents_loaded",
@@ -73,7 +73,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13800,
+    "id": 12760,
     "key": "traveling_people",
     "namespace": null,
     "status": "documents_loaded",
@@ -96,7 +96,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13820,
+    "id": 12780,
     "key": "ben_dover",
     "namespace": null,
     "status": "documents_loaded",
@@ -119,7 +119,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13840,
+    "id": 12800,
     "key": "me",
     "namespace": null,
     "status": "documents_loaded",
@@ -142,7 +142,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13860,
+    "id": 12820,
     "key": "not_found",
     "namespace": null,
     "status": "content_loaded",
@@ -168,7 +168,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13880,
+    "id": 12840,
     "key": "not_found",
     "namespace": null,
     "status": "content_loaded",
@@ -194,7 +194,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13900,
+    "id": 12860,
     "key": "query",
     "namespace": null,
     "status": "documents_loaded",
@@ -217,7 +217,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13920,
+    "id": 12880,
     "key": "rich_data",
     "namespace": null,
     "status": "documents_loaded",
@@ -240,7 +240,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13940,
+    "id": 12900,
     "key": "people_csv",
     "namespace": null,
     "status": "documents_loaded",
@@ -263,7 +263,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13960,
+    "id": 12920,
     "key": "site_definition_rb",
     "namespace": null,
     "status": "documents_loaded",
@@ -286,7 +286,7 @@
     "area_namespace": "tp",
     "area_resource_count": 11,
     "area_document_count": 12,
-    "id": 13980,
+    "id": 12940,
     "key": "string_color_rb",
     "namespace": null,
     "status": "documents_loaded",