diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a2369110..adf3b85d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,16 +20,19 @@ jobs:
       - name: Setup
         run: |
           sudo apt-get update
-          sudo apt-get install --no-install-recommends -y gcc-9 g++-9
+          sudo apt-get install --no-install-recommends -y gcc-9 g++-9 graphviz
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 900 \
             --slave /usr/bin/g++ g++ /usr/bin/g++-9
-          bazelisk build //alphasql/...
-          bazelisk test --test_output=errors //alphasql/...
+          make
 
-          ./bazel-bin/alphasql/alphadag ./samples/sample
-          ./bazel-bin/alphasql/alphadag --output_path=dag.dot ./samples/sample
-          ./bazel-bin/alphasql/alphadag --external_required_tables_output_path=dag.dot ./samples/sample
+          echo 🚨 checking sample testing result...
+          echo 🚨 exit if not up-to-date
+          # TODO: check dag output isomorphism
+          git diff --exit-code -- '*.txt'
 
+          alphadag ./samples/sample
+          alphadag --output_path=dag.dot ./samples/sample
+          alphadag --external_required_tables_output_path=dag.dot ./samples/sample
 
   osx:
     name: Test the repository on Mac
@@ -50,8 +53,14 @@ jobs:
           brew install graphviz
           sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
           bazel shutdown
+          export CC=g++
           make
 
+          echo 🚨 checking sample testing result...
+          echo 🚨 exit if not up-to-date
+          # TODO: check dag output isomorphism
+          git diff --exit-code -- '*.txt'
+
           alphadag ./samples/sample
           alphadag --output_path=dag.dot ./samples/sample
           alphadag --external_required_tables_output_path=dag.dot ./samples/sample
diff --git a/Makefile b/Makefile
index 863884ff..3c551016 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,21 @@
 .PHONY: build-and-check
-build-and-check: test git-clean
+build-and-check: build
+	make test
 	make samples
 
-git-clean:
-	git diff --quiet
-
-.PHONY: osx
-osx:
-	CC=g++ bazelisk build //alphasql:all
-	sudo cp ./bazel-bin/alphasql/alphadag /usr/local/bin
-	sudo chmod +x /usr/local/bin/alphadag
-	sudo cp ./bazel-bin/alphasql/alphacheck /usr/local/bin
-	sudo chmod +x /usr/local/bin/alphacheck
+.PHONY: build
+build:
+	bazel build //alphasql:all
+	cp ./bazel-bin/alphasql/alphadag /usr/local/bin
+	chmod +x /usr/local/bin/alphadag
+	cp ./bazel-bin/alphasql/alphacheck /usr/local/bin
+	chmod +x /usr/local/bin/alphacheck
 
 .PHONY: samples
 samples: without_options with_functions with_tables with_all side_effect_first side_effect_first_with_tables
 
 .PHONY: without_options
-without_options: osx
+without_options:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 		alphadag $$sample_path --output_path $$sample_path/dag.dot \
 			--external_required_tables_output_path $$sample_path/external_tables.txt \
@@ -29,7 +27,7 @@ without_options: osx
 	done;
 
 .PHONY: with_functions
-with_functions: osx
+with_functions:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 	  mkdir -p $$sample_path/with_functions; \
 		alphadag --with_functions $$sample_path --output_path $$sample_path/with_functions/dag.dot \
@@ -39,7 +37,7 @@ with_functions: osx
 	done;
 
 .PHONY: with_tables
-with_tables: osx
+with_tables:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 	  mkdir -p $$sample_path/with_tables; \
     alphadag --with_tables $$sample_path --output_path $$sample_path/with_tables/dag.dot \
@@ -49,7 +47,7 @@ with_tables: osx
 	done;
 
 .PHONY: with_all
-with_all: osx
+with_all:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 	  mkdir -p $$sample_path/with_all; \
 		alphadag --with_tables --with_functions $$sample_path --output_path $$sample_path/with_all/dag.dot \
@@ -59,7 +57,7 @@ with_all: osx
 	done;
 
 .PHONY: side_effect_first
-side_effect_first: osx
+side_effect_first:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 	  mkdir -p $$sample_path/side_effect_first; \
 		alphadag --side_effect_first $$sample_path --output_path $$sample_path/side_effect_first/dag.dot \
@@ -68,7 +66,7 @@ side_effect_first: osx
     dot -Tpng $$sample_path/side_effect_first/dag.dot -o $$sample_path/side_effect_first/dag.png; \
 	done;
 
-side_effect_first_with_tables: osx
+side_effect_first_with_tables:
 	find samples -mindepth 1 -maxdepth 1 -type d | while read sample_path; do \
 	  mkdir -p $$sample_path/side_effect_first_with_tables; \
 	 	alphadag --side_effect_first --with_tables $$sample_path --output_path $$sample_path/side_effect_first_with_tables/dag.dot \
@@ -78,5 +76,5 @@ side_effect_first_with_tables: osx
 	done;
 
 .PHONY: test
-test: osx
-	CC=g++ bazelisk test //alphasql:all
+test:
+	bazel test //alphasql:all
diff --git a/alphasql/alphacheck.cc b/alphasql/alphacheck.cc
index 176de081..d2653412 100644
--- a/alphasql/alphacheck.cc
+++ b/alphasql/alphacheck.cc
@@ -325,6 +325,18 @@ absl::Status Run(const std::string &sql_file_path,
   return absl::OkStatus();
 }
 
+// TODO: Hide implementation and unify
+struct cycle_detector : public boost::dfs_visitor<> {
+  cycle_detector(bool &has_cycle) : _has_cycle(has_cycle) {}
+
+  template <class Edge, class Graph> void back_edge(Edge, Graph &) {
+    _has_cycle = true;
+  }
+
+protected:
+  bool &_has_cycle;
+};
+
 bool GetExecutionPlan(const std::string dot_path,
                       std::vector<std::string> &execution_plan) {
   using namespace boost;
@@ -339,6 +351,16 @@ bool GetExecutionPlan(const std::string dot_path,
   if (!boost::read_graphviz(file, g, dp)) {
     return false;
   }
+
+  bool has_cycle = false;
+  cycle_detector vis(has_cycle);
+  depth_first_search(g, visitor(vis));
+  if (has_cycle) {
+    std::cerr << "ERROR: cycle detected! [at " << dot_path << ":1:1]"
+              << std::endl;
+    exit(1);
+  }
+
   std::list<int> result;
   topological_sort(g, std::front_inserter(result));
   property_map<Graph, vertex_name_t>::type names = get(vertex_name, g);
diff --git a/alphasql/alphadag.cc b/alphasql/alphadag.cc
index 05da6569..8f3ab20a 100644
--- a/alphasql/alphadag.cc
+++ b/alphasql/alphadag.cc
@@ -65,12 +65,12 @@ int main(int argc, char *argv[]) {
       }
       continue;
     }
-    std::filesystem::recursive_directory_iterator file_path(
-        path, std::filesystem::directory_options::skip_permission_denied),
-        end;
+    std::vector<std::filesystem::path> files_in_directory;
+    std::copy(std::filesystem::recursive_directory_iterator(path, std::filesystem::directory_options::skip_permission_denied), std::filesystem::recursive_directory_iterator(), std::back_inserter(files_in_directory));
+    std::sort(files_in_directory.begin(), files_in_directory.end());
     std::error_code err;
-    for (; file_path != end; file_path.increment(err)) {
-      std::string path_str = file_path->path().string();
+    for (const std::filesystem::path & file_path : files_in_directory) {
+      std::string path_str = file_path.string();
       if (regex_match(path_str, m, DEFAULT_EXCLUDES)) {
         continue;
       }
@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) {
         std::cout << "WARNING: " << err << std::endl;
       }
       absl::Status status = alphasql::UpdateIdentifierQueriesMapsAndVertices(
-          file_path->path(), table_queries_map, function_queries_map, vertices);
+          file_path, table_queries_map, function_queries_map, vertices);
       if (!status.ok()) {
         status = zetasql::UpdateErrorLocationPayloadWithFilenameIfNotPresent(status, path);
         std::cerr << status << std::endl;
diff --git a/alphasql/identifier_resolver.cc b/alphasql/identifier_resolver.cc
index f242fa4c..1ee2aab3 100644
--- a/alphasql/identifier_resolver.cc
+++ b/alphasql/identifier_resolver.cc
@@ -105,6 +105,11 @@ GetIdentifierInformation(const std::string &sql_file_path) {
 void IdentifierResolver::visitASTDropStatement(const ASTDropStatement *node,
                                                void *data) {
   if (node->schema_object_kind() == SchemaObjectKind::kTable) {
+    const auto table_name = absl::StrJoin(node->name()->ToIdentifierVector(), ".");
+    if (temporary_tables.find(table_name) != temporary_tables.end()) {
+      visitASTChildren(node, data);
+      return;
+    }
     identifier_information.table_information.dropped.insert(
         node->name()->ToIdentifierVector());
   }
@@ -143,6 +148,11 @@ void IdentifierResolver::visitASTInsertStatement(const ASTInsertStatement *node,
   }
 
   const auto path = status_or_path.value()->ToIdentifierVector();
+  const auto table_name = absl::StrJoin(path, ".");
+  if (temporary_tables.find(table_name) != temporary_tables.end()) {
+    visitASTChildren(node, data);
+    return;
+  }
   identifier_information.table_information.inserted.insert(path);
 
   const std::string path_str = absl::StrJoin(path, ".");
@@ -177,6 +187,11 @@ void IdentifierResolver::visitASTUpdateStatement(const ASTUpdateStatement *node,
   }
 
   const auto path = status_or_path.value()->ToIdentifierVector();
+  const auto table_name = absl::StrJoin(path, ".");
+  if (temporary_tables.find(table_name) != temporary_tables.end()) {
+    visitASTChildren(node, data);
+    return;
+  }
   identifier_information.table_information.updated.insert(path);
 
   const std::string path_str = absl::StrJoin(path, ".");
diff --git a/samples/create-temp-table-test/alphadag_stdout.txt b/samples/create-temp-table-test/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/dag.png b/samples/create-temp-table-test/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/dag.png and b/samples/create-temp-table-test/dag.png differ
diff --git a/samples/create-temp-table-test/reference.sql b/samples/create-temp-table-test/reference.sql
index ee0c9426..b5113bf2 100644
--- a/samples/create-temp-table-test/reference.sql
+++ b/samples/create-temp-table-test/reference.sql
@@ -1,2 +1,3 @@
 CREATE TEMP TABLE tmp AS SELECT 1 as tmp_column;
 SELECT * FROM tmp;
+INSERT INTO tmp SELECT 2;
diff --git a/samples/create-temp-table-test/side_effect_first/alphadag_stdout.txt b/samples/create-temp-table-test/side_effect_first/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/side_effect_first/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/side_effect_first/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/side_effect_first/dag.png b/samples/create-temp-table-test/side_effect_first/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/side_effect_first/dag.png and b/samples/create-temp-table-test/side_effect_first/dag.png differ
diff --git a/samples/create-temp-table-test/side_effect_first_with_tables/alphadag_stdout.txt b/samples/create-temp-table-test/side_effect_first_with_tables/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/side_effect_first_with_tables/dag.png b/samples/create-temp-table-test/side_effect_first_with_tables/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/side_effect_first_with_tables/dag.png and b/samples/create-temp-table-test/side_effect_first_with_tables/dag.png differ
diff --git a/samples/create-temp-table-test/with_all/alphadag_stdout.txt b/samples/create-temp-table-test/with_all/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/with_all/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/with_all/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/with_all/dag.png b/samples/create-temp-table-test/with_all/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/with_all/dag.png and b/samples/create-temp-table-test/with_all/dag.png differ
diff --git a/samples/create-temp-table-test/with_functions/alphadag_stdout.txt b/samples/create-temp-table-test/with_functions/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/with_functions/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/with_functions/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/with_functions/dag.png b/samples/create-temp-table-test/with_functions/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/with_functions/dag.png and b/samples/create-temp-table-test/with_functions/dag.png differ
diff --git a/samples/create-temp-table-test/with_tables/alphadag_stdout.txt b/samples/create-temp-table-test/with_tables/alphadag_stdout.txt
index 574e059b..b3980b29 100644
--- a/samples/create-temp-table-test/with_tables/alphadag_stdout.txt
+++ b/samples/create-temp-table-test/with_tables/alphadag_stdout.txt
@@ -1,4 +1,4 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/create-temp-table-test/temp_table.sql"
 Reading "samples/create-temp-table-test/reference.sql"
+Reading "samples/create-temp-table-test/temp_table.sql"
diff --git a/samples/create-temp-table-test/with_tables/dag.png b/samples/create-temp-table-test/with_tables/dag.png
index 23f0d54f..75cdd15d 100644
Binary files a/samples/create-temp-table-test/with_tables/dag.png and b/samples/create-temp-table-test/with_tables/dag.png differ
diff --git a/samples/drop-test/dag.png b/samples/drop-test/dag.png
index a8b147ce..fc4a1e47 100644
Binary files a/samples/drop-test/dag.png and b/samples/drop-test/dag.png differ
diff --git a/samples/drop-test/side_effect_first/dag.png b/samples/drop-test/side_effect_first/dag.png
index a8b147ce..fc4a1e47 100644
Binary files a/samples/drop-test/side_effect_first/dag.png and b/samples/drop-test/side_effect_first/dag.png differ
diff --git a/samples/drop-test/side_effect_first_with_tables/dag.png b/samples/drop-test/side_effect_first_with_tables/dag.png
index 33030799..4839f1fc 100644
Binary files a/samples/drop-test/side_effect_first_with_tables/dag.png and b/samples/drop-test/side_effect_first_with_tables/dag.png differ
diff --git a/samples/drop-test/with_all/dag.png b/samples/drop-test/with_all/dag.png
index 33030799..4839f1fc 100644
Binary files a/samples/drop-test/with_all/dag.png and b/samples/drop-test/with_all/dag.png differ
diff --git a/samples/drop-test/with_functions/dag.png b/samples/drop-test/with_functions/dag.png
index a8b147ce..fc4a1e47 100644
Binary files a/samples/drop-test/with_functions/dag.png and b/samples/drop-test/with_functions/dag.png differ
diff --git a/samples/drop-test/with_tables/dag.png b/samples/drop-test/with_tables/dag.png
index 33030799..4839f1fc 100644
Binary files a/samples/drop-test/with_tables/dag.png and b/samples/drop-test/with_tables/dag.png differ
diff --git a/samples/mutasions-and-query/alphadag_stdout.txt b/samples/mutasions-and-query/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/dag.png b/samples/mutasions-and-query/dag.png
index 0f8a07b2..20e6e93b 100644
Binary files a/samples/mutasions-and-query/dag.png and b/samples/mutasions-and-query/dag.png differ
diff --git a/samples/mutasions-and-query/side_effect_first/alphadag_stdout.txt b/samples/mutasions-and-query/side_effect_first/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/side_effect_first/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/side_effect_first/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/side_effect_first/dag.png b/samples/mutasions-and-query/side_effect_first/dag.png
index 5d1e8897..db8809b4 100644
Binary files a/samples/mutasions-and-query/side_effect_first/dag.png and b/samples/mutasions-and-query/side_effect_first/dag.png differ
diff --git a/samples/mutasions-and-query/side_effect_first_with_tables/alphadag_stdout.txt b/samples/mutasions-and-query/side_effect_first_with_tables/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/side_effect_first_with_tables/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/side_effect_first_with_tables/dag.png b/samples/mutasions-and-query/side_effect_first_with_tables/dag.png
index 0aa1017b..94ff7146 100644
Binary files a/samples/mutasions-and-query/side_effect_first_with_tables/dag.png and b/samples/mutasions-and-query/side_effect_first_with_tables/dag.png differ
diff --git a/samples/mutasions-and-query/with_all/alphadag_stdout.txt b/samples/mutasions-and-query/with_all/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/with_all/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/with_all/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/with_all/dag.png b/samples/mutasions-and-query/with_all/dag.png
index d5b8fdbb..8cb5ca9f 100644
Binary files a/samples/mutasions-and-query/with_all/dag.png and b/samples/mutasions-and-query/with_all/dag.png differ
diff --git a/samples/mutasions-and-query/with_functions/alphadag_stdout.txt b/samples/mutasions-and-query/with_functions/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/with_functions/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/with_functions/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/with_functions/dag.png b/samples/mutasions-and-query/with_functions/dag.png
index 0f8a07b2..20e6e93b 100644
Binary files a/samples/mutasions-and-query/with_functions/dag.png and b/samples/mutasions-and-query/with_functions/dag.png differ
diff --git a/samples/mutasions-and-query/with_tables/alphadag_stdout.txt b/samples/mutasions-and-query/with_tables/alphadag_stdout.txt
index b99ddb67..b0767db2 100644
--- a/samples/mutasions-and-query/with_tables/alphadag_stdout.txt
+++ b/samples/mutasions-and-query/with_tables/alphadag_stdout.txt
@@ -11,6 +11,6 @@ This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5
 Reading "samples/mutasions-and-query/mutation3.sql"
 Warning!!! the target of UPDATE statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/mutasions-and-query/query1.sql"
 Reading "samples/mutasions-and-query/query2.sql"
 Reading "samples/mutasions-and-query/query3.sql"
-Reading "samples/mutasions-and-query/query1.sql"
diff --git a/samples/mutasions-and-query/with_tables/dag.png b/samples/mutasions-and-query/with_tables/dag.png
index d5b8fdbb..8cb5ca9f 100644
Binary files a/samples/mutasions-and-query/with_tables/dag.png and b/samples/mutasions-and-query/with_tables/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/dag.png
index a6e8a9e6..5472f017 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/dag.png
index 72803423..62916695 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/dag.png
index 88c02911..ec005f84 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.dot b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.dot
index b397a557..09a8304a 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.dot
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.dot
@@ -8,8 +8,8 @@ digraph G {
 1->4 ;
 4->2 ;
 4->3 ;
-5->2 ;
-5->3 ;
 5->0 ;
 5->1 ;
+5->2 ;
+5->3 ;
 }
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.png
index a2f29336..14970586 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_all/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/dag.png
index a6e8a9e6..5472f017 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_functions/dag.png differ
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/alphadag_stdout.txt b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/alphadag_stdout.txt
index f847cc25..40514d6f 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/alphadag_stdout.txt
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/alphadag_stdout.txt
@@ -1,10 +1,10 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
-Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
 Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/insert_before_reference.sql"
 Warning!!! the target of INSERT statement dataset.main is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select.sql"
+Reading "samples/sample-arbitrary-dependency-graph-with-drop-statement/select2.sql"
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.dot b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.dot
index b397a557..09a8304a 100644
--- a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.dot
+++ b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.dot
@@ -8,8 +8,8 @@ digraph G {
 1->4 ;
 4->2 ;
 4->3 ;
-5->2 ;
-5->3 ;
 5->0 ;
 5->1 ;
+5->2 ;
+5->3 ;
 }
diff --git a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.png b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.png
index a2f29336..14970586 100644
Binary files a/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.png and b/samples/sample-arbitrary-dependency-graph-with-drop-statement/with_tables/dag.png differ
diff --git a/samples/sample-ci/alphacheck_stderr.txt b/samples/sample-ci/alphacheck_stderr.txt
index e69de29b..c4d55125 100644
--- a/samples/sample-ci/alphacheck_stderr.txt
+++ b/samples/sample-ci/alphacheck_stderr.txt
@@ -0,0 +1 @@
+ERROR: INVALID_ARGUMENT: Table not found: `bigquery-public-data.samples.gsod` [at samples/sample-ci/sample/create_datawarehouse3.sql:5:3]
diff --git a/samples/sample-ci/alphacheck_stdout.txt b/samples/sample-ci/alphacheck_stdout.txt
index b27f65fd..1be14586 100644
--- a/samples/sample-ci/alphacheck_stdout.txt
+++ b/samples/sample-ci/alphacheck_stdout.txt
@@ -1,5 +1,4 @@
 Analyzing "samples/sample-ci/sample/create_datawarehouse3.sql"
-ERROR: INVALID_ARGUMENT: Table not found: `bigquery-public-data.samples.gsod` [at samples/sample-ci/sample/create_datawarehouse3.sql:5:3]
 catalog:
 	dataset.main
 	tablename1
diff --git a/samples/sample-ci/alphadag_stdout.txt b/samples/sample-ci/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/alphadag_stdout.txt
+++ b/samples/sample-ci/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/dag.dot b/samples/sample-ci/dag.dot
index 551b7958..e22d9978 100644
--- a/samples/sample-ci/dag.dot
+++ b/samples/sample-ci/dag.dot
@@ -13,12 +13,12 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
-3->7 ;
+2->5 ;
 3->6 ;
-4->8 ;
+3->7 ;
 4->6 ;
-5->7 ;
+4->8 ;
 5->6 ;
+5->7 ;
 }
diff --git a/samples/sample-ci/dag.png b/samples/sample-ci/dag.png
index 27986a18..6ae74a66 100644
Binary files a/samples/sample-ci/dag.png and b/samples/sample-ci/dag.png differ
diff --git a/samples/sample-ci/side_effect_first/alphadag_stdout.txt b/samples/sample-ci/side_effect_first/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample-ci/side_effect_first/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/side_effect_first/dag.dot b/samples/sample-ci/side_effect_first/dag.dot
index bc92117c..5fdfdf4d 100644
--- a/samples/sample-ci/side_effect_first/dag.dot
+++ b/samples/sample-ci/side_effect_first/dag.dot
@@ -13,14 +13,14 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
+2->5 ;
 3->7 ;
 3->6 ;
 4->8 ;
 4->6 ;
-5->7 ;
 5->6 ;
+5->7 ;
 7->6 ;
 8->6 ;
 }
diff --git a/samples/sample-ci/side_effect_first/dag.png b/samples/sample-ci/side_effect_first/dag.png
index b2598a25..e7a1f64b 100644
Binary files a/samples/sample-ci/side_effect_first/dag.png and b/samples/sample-ci/side_effect_first/dag.png differ
diff --git a/samples/sample-ci/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample-ci/side_effect_first_with_tables/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample-ci/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/side_effect_first_with_tables/dag.dot b/samples/sample-ci/side_effect_first_with_tables/dag.dot
index ab23c833..225dc866 100644
--- a/samples/sample-ci/side_effect_first_with_tables/dag.dot
+++ b/samples/sample-ci/side_effect_first_with_tables/dag.dot
@@ -28,17 +28,17 @@ digraph G {
 7->13 ;
 8->14 ;
 9->0 ;
-9->2 ;
 9->1 ;
+9->2 ;
 10->3 ;
 10->5 ;
 10->6 ;
 11->3 ;
 11->4 ;
-12->5 ;
 12->4 ;
+12->5 ;
 13->6 ;
 14->6 ;
-15->7 ;
 15->6 ;
+15->7 ;
 }
diff --git a/samples/sample-ci/side_effect_first_with_tables/dag.png b/samples/sample-ci/side_effect_first_with_tables/dag.png
index 02d768f6..523304fb 100644
Binary files a/samples/sample-ci/side_effect_first_with_tables/dag.png and b/samples/sample-ci/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample-ci/with_all/alphadag_stdout.txt b/samples/sample-ci/with_all/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/with_all/alphadag_stdout.txt
+++ b/samples/sample-ci/with_all/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/with_all/dag.dot b/samples/sample-ci/with_all/dag.dot
index 93e99b1c..304acdff 100644
--- a/samples/sample-ci/with_all/dag.dot
+++ b/samples/sample-ci/with_all/dag.dot
@@ -24,19 +24,19 @@ digraph G {
 5->15 ;
 6->16 ;
 9->0 ;
-9->2 ;
 9->1 ;
+9->2 ;
 10->3 ;
 10->5 ;
 10->6 ;
 11->3 ;
 11->4 ;
-12->5 ;
 12->4 ;
-13->7 ;
+12->5 ;
 13->6 ;
-14->8 ;
+13->7 ;
 14->6 ;
-15->7 ;
+14->8 ;
 15->6 ;
+15->7 ;
 }
diff --git a/samples/sample-ci/with_all/dag.png b/samples/sample-ci/with_all/dag.png
index 0519ad0f..d5828d06 100644
Binary files a/samples/sample-ci/with_all/dag.png and b/samples/sample-ci/with_all/dag.png differ
diff --git a/samples/sample-ci/with_functions/alphadag_stdout.txt b/samples/sample-ci/with_functions/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/with_functions/alphadag_stdout.txt
+++ b/samples/sample-ci/with_functions/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/with_functions/dag.dot b/samples/sample-ci/with_functions/dag.dot
index 551b7958..e22d9978 100644
--- a/samples/sample-ci/with_functions/dag.dot
+++ b/samples/sample-ci/with_functions/dag.dot
@@ -13,12 +13,12 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
-3->7 ;
+2->5 ;
 3->6 ;
-4->8 ;
+3->7 ;
 4->6 ;
-5->7 ;
+4->8 ;
 5->6 ;
+5->7 ;
 }
diff --git a/samples/sample-ci/with_functions/dag.png b/samples/sample-ci/with_functions/dag.png
index 27986a18..6ae74a66 100644
Binary files a/samples/sample-ci/with_functions/dag.png and b/samples/sample-ci/with_functions/dag.png differ
diff --git a/samples/sample-ci/with_tables/alphadag_stdout.txt b/samples/sample-ci/with_tables/alphadag_stdout.txt
index e6016e68..fea2e775 100644
--- a/samples/sample-ci/with_tables/alphadag_stdout.txt
+++ b/samples/sample-ci/with_tables/alphadag_stdout.txt
@@ -1,15 +1,15 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
+Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
 Reading "samples/sample-ci/sample/create_interim1.sql"
-Reading "samples/sample-ci/sample/create_interim3.sql"
 Reading "samples/sample-ci/sample/create_interim2.sql"
-Reading "samples/sample-ci/sample/update_interim2.sql"
-Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
-This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
+Reading "samples/sample-ci/sample/create_interim3.sql"
+Reading "samples/sample-ci/sample/create_mart.sql"
 Reading "samples/sample-ci/sample/insert_into_interim1.sql"
 Warning!!! the target of INSERT statement interim1 is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-ci/sample/create_datawarehouse1.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse3.sql"
-Reading "samples/sample-ci/sample/create_datawarehouse2.sql"
-Reading "samples/sample-ci/sample/create_mart.sql"
+Reading "samples/sample-ci/sample/update_interim2.sql"
+Warning!!! the target of UPDATE statement interim2 is not created in the same script!!!
+This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
diff --git a/samples/sample-ci/with_tables/dag.dot b/samples/sample-ci/with_tables/dag.dot
index 93e99b1c..304acdff 100644
--- a/samples/sample-ci/with_tables/dag.dot
+++ b/samples/sample-ci/with_tables/dag.dot
@@ -24,19 +24,19 @@ digraph G {
 5->15 ;
 6->16 ;
 9->0 ;
-9->2 ;
 9->1 ;
+9->2 ;
 10->3 ;
 10->5 ;
 10->6 ;
 11->3 ;
 11->4 ;
-12->5 ;
 12->4 ;
-13->7 ;
+12->5 ;
 13->6 ;
-14->8 ;
+13->7 ;
 14->6 ;
-15->7 ;
+14->8 ;
 15->6 ;
+15->7 ;
 }
diff --git a/samples/sample-ci/with_tables/dag.png b/samples/sample-ci/with_tables/dag.png
index 0519ad0f..d5828d06 100644
Binary files a/samples/sample-ci/with_tables/dag.png and b/samples/sample-ci/with_tables/dag.png differ
diff --git a/samples/sample-cycle/alphacheck_stderr.txt b/samples/sample-cycle/alphacheck_stderr.txt
index dd9eb4d5..5bc9ee4c 100644
--- a/samples/sample-cycle/alphacheck_stderr.txt
+++ b/samples/sample-cycle/alphacheck_stderr.txt
@@ -1 +1 @@
-libc++abi: terminating with uncaught exception of type boost::exception_detail::clone_impl<boost::exception_detail::error_info_injector<boost::not_a_dag> >: The graph must be a DAG.
+ERROR: cycle detected! [at samples/sample-cycle/dag.dot:1:1]
diff --git a/samples/sample-cycle/alphadag_stdout.txt b/samples/sample-cycle/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/alphadag_stdout.txt
+++ b/samples/sample-cycle/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/dag.png b/samples/sample-cycle/dag.png
index 7895bf04..49ea0642 100644
Binary files a/samples/sample-cycle/dag.png and b/samples/sample-cycle/dag.png differ
diff --git a/samples/sample-cycle/side_effect_first/alphadag_stdout.txt b/samples/sample-cycle/side_effect_first/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample-cycle/side_effect_first/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/side_effect_first/dag.png b/samples/sample-cycle/side_effect_first/dag.png
index 7895bf04..49ea0642 100644
Binary files a/samples/sample-cycle/side_effect_first/dag.png and b/samples/sample-cycle/side_effect_first/dag.png differ
diff --git a/samples/sample-cycle/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample-cycle/side_effect_first_with_tables/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample-cycle/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/side_effect_first_with_tables/dag.png b/samples/sample-cycle/side_effect_first_with_tables/dag.png
index 4425efd2..cc2ad736 100644
Binary files a/samples/sample-cycle/side_effect_first_with_tables/dag.png and b/samples/sample-cycle/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample-cycle/with_all/alphadag_stdout.txt b/samples/sample-cycle/with_all/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/with_all/alphadag_stdout.txt
+++ b/samples/sample-cycle/with_all/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/with_all/dag.png b/samples/sample-cycle/with_all/dag.png
index 4425efd2..cc2ad736 100644
Binary files a/samples/sample-cycle/with_all/dag.png and b/samples/sample-cycle/with_all/dag.png differ
diff --git a/samples/sample-cycle/with_functions/alphadag_stdout.txt b/samples/sample-cycle/with_functions/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/with_functions/alphadag_stdout.txt
+++ b/samples/sample-cycle/with_functions/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/with_functions/dag.png b/samples/sample-cycle/with_functions/dag.png
index 7895bf04..49ea0642 100644
Binary files a/samples/sample-cycle/with_functions/dag.png and b/samples/sample-cycle/with_functions/dag.png differ
diff --git a/samples/sample-cycle/with_tables/alphadag_stdout.txt b/samples/sample-cycle/with_tables/alphadag_stdout.txt
index 6200d218..72ca11e5 100644
--- a/samples/sample-cycle/with_tables/alphadag_stdout.txt
+++ b/samples/sample-cycle/with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-cycle/create_table2.sql"
 Reading "samples/sample-cycle/create_table1.sql"
+Reading "samples/sample-cycle/create_table2.sql"
 Warning!!! There are cycles in your dependency graph!!! 
diff --git a/samples/sample-cycle/with_tables/dag.png b/samples/sample-cycle/with_tables/dag.png
index 4425efd2..cc2ad736 100644
Binary files a/samples/sample-cycle/with_tables/dag.png and b/samples/sample-cycle/with_tables/dag.png differ
diff --git a/samples/sample-function-dependency/alphadag_stdout.txt b/samples/sample-function-dependency/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/dag.dot b/samples/sample-function-dependency/dag.dot
index 305042a3..71f9d98a 100644
--- a/samples/sample-function-dependency/dag.dot
+++ b/samples/sample-function-dependency/dag.dot
@@ -3,6 +3,6 @@ digraph G {
 1 [label="samples/sample-function-dependency/udf2.sql", shape="", type=query];
 2 [label="samples/sample-function-dependency/with-udf.sql", shape="", type=query];
 0->2 ;
-1->2 ;
 1->0 ;
+1->2 ;
 }
diff --git a/samples/sample-function-dependency/dag.png b/samples/sample-function-dependency/dag.png
index d006bf93..a6cbaf90 100644
Binary files a/samples/sample-function-dependency/dag.png and b/samples/sample-function-dependency/dag.png differ
diff --git a/samples/sample-function-dependency/side_effect_first/alphadag_stdout.txt b/samples/sample-function-dependency/side_effect_first/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/side_effect_first/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/side_effect_first/dag.dot b/samples/sample-function-dependency/side_effect_first/dag.dot
index 305042a3..71f9d98a 100644
--- a/samples/sample-function-dependency/side_effect_first/dag.dot
+++ b/samples/sample-function-dependency/side_effect_first/dag.dot
@@ -3,6 +3,6 @@ digraph G {
 1 [label="samples/sample-function-dependency/udf2.sql", shape="", type=query];
 2 [label="samples/sample-function-dependency/with-udf.sql", shape="", type=query];
 0->2 ;
-1->2 ;
 1->0 ;
+1->2 ;
 }
diff --git a/samples/sample-function-dependency/side_effect_first/dag.png b/samples/sample-function-dependency/side_effect_first/dag.png
index d006bf93..a6cbaf90 100644
Binary files a/samples/sample-function-dependency/side_effect_first/dag.png and b/samples/sample-function-dependency/side_effect_first/dag.png differ
diff --git a/samples/sample-function-dependency/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample-function-dependency/side_effect_first_with_tables/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/side_effect_first_with_tables/dag.dot b/samples/sample-function-dependency/side_effect_first_with_tables/dag.dot
index 305042a3..71f9d98a 100644
--- a/samples/sample-function-dependency/side_effect_first_with_tables/dag.dot
+++ b/samples/sample-function-dependency/side_effect_first_with_tables/dag.dot
@@ -3,6 +3,6 @@ digraph G {
 1 [label="samples/sample-function-dependency/udf2.sql", shape="", type=query];
 2 [label="samples/sample-function-dependency/with-udf.sql", shape="", type=query];
 0->2 ;
-1->2 ;
 1->0 ;
+1->2 ;
 }
diff --git a/samples/sample-function-dependency/side_effect_first_with_tables/dag.png b/samples/sample-function-dependency/side_effect_first_with_tables/dag.png
index d006bf93..a6cbaf90 100644
Binary files a/samples/sample-function-dependency/side_effect_first_with_tables/dag.png and b/samples/sample-function-dependency/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample-function-dependency/with_all/alphadag_stdout.txt b/samples/sample-function-dependency/with_all/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/with_all/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/with_all/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/with_all/dag.dot b/samples/sample-function-dependency/with_all/dag.dot
index 3155b651..e66690f8 100644
--- a/samples/sample-function-dependency/with_all/dag.dot
+++ b/samples/sample-function-dependency/with_all/dag.dot
@@ -6,7 +6,7 @@ digraph G {
 4 [label=multiplyInputs, shape=cds, type=function];
 0->4 ;
 1->3 ;
-3->2 ;
 3->0 ;
+3->2 ;
 4->2 ;
 }
diff --git a/samples/sample-function-dependency/with_all/dag.png b/samples/sample-function-dependency/with_all/dag.png
index 161ea0eb..7552003d 100644
Binary files a/samples/sample-function-dependency/with_all/dag.png and b/samples/sample-function-dependency/with_all/dag.png differ
diff --git a/samples/sample-function-dependency/with_functions/alphadag_stdout.txt b/samples/sample-function-dependency/with_functions/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/with_functions/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/with_functions/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/with_functions/dag.dot b/samples/sample-function-dependency/with_functions/dag.dot
index 3155b651..e66690f8 100644
--- a/samples/sample-function-dependency/with_functions/dag.dot
+++ b/samples/sample-function-dependency/with_functions/dag.dot
@@ -6,7 +6,7 @@ digraph G {
 4 [label=multiplyInputs, shape=cds, type=function];
 0->4 ;
 1->3 ;
-3->2 ;
 3->0 ;
+3->2 ;
 4->2 ;
 }
diff --git a/samples/sample-function-dependency/with_functions/dag.png b/samples/sample-function-dependency/with_functions/dag.png
index 161ea0eb..7552003d 100644
Binary files a/samples/sample-function-dependency/with_functions/dag.png and b/samples/sample-function-dependency/with_functions/dag.png differ
diff --git a/samples/sample-function-dependency/with_tables/alphadag_stdout.txt b/samples/sample-function-dependency/with_tables/alphadag_stdout.txt
index f6995558..44746f4d 100644
--- a/samples/sample-function-dependency/with_tables/alphadag_stdout.txt
+++ b/samples/sample-function-dependency/with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-function-dependency/with-udf.sql"
-Reading "samples/sample-function-dependency/udf2.sql"
 Reading "samples/sample-function-dependency/udf1.sql"
+Reading "samples/sample-function-dependency/udf2.sql"
+Reading "samples/sample-function-dependency/with-udf.sql"
diff --git a/samples/sample-function-dependency/with_tables/dag.dot b/samples/sample-function-dependency/with_tables/dag.dot
index 305042a3..71f9d98a 100644
--- a/samples/sample-function-dependency/with_tables/dag.dot
+++ b/samples/sample-function-dependency/with_tables/dag.dot
@@ -3,6 +3,6 @@ digraph G {
 1 [label="samples/sample-function-dependency/udf2.sql", shape="", type=query];
 2 [label="samples/sample-function-dependency/with-udf.sql", shape="", type=query];
 0->2 ;
-1->2 ;
 1->0 ;
+1->2 ;
 }
diff --git a/samples/sample-function-dependency/with_tables/dag.png b/samples/sample-function-dependency/with_tables/dag.png
index d006bf93..a6cbaf90 100644
Binary files a/samples/sample-function-dependency/with_tables/dag.png and b/samples/sample-function-dependency/with_tables/dag.png differ
diff --git a/samples/sample-undefined/alphacheck_stdout.txt b/samples/sample-undefined/alphacheck_stdout.txt
index 77a97071..e174da5f 100644
--- a/samples/sample-undefined/alphacheck_stdout.txt
+++ b/samples/sample-undefined/alphacheck_stdout.txt
@@ -1,8 +1,8 @@
 Analyzing "samples/sample-undefined/create.sql"
 DDL analyzed, adding table to catalog...
 SUCCESS: analysis finished!
-Analyzing "samples/sample-undefined/insert.sql"
-SUCCESS: analysis finished!
 Analyzing "samples/sample-undefined/select.sql"
 SUCCESS: analysis finished!
+Analyzing "samples/sample-undefined/insert.sql"
+SUCCESS: analysis finished!
 Successfully finished type check!
diff --git a/samples/sample-undefined/alphadag_stdout.txt b/samples/sample-undefined/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/alphadag_stdout.txt
+++ b/samples/sample-undefined/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/dag.dot b/samples/sample-undefined/dag.dot
index 87342957..7fda856c 100644
--- a/samples/sample-undefined/dag.dot
+++ b/samples/sample-undefined/dag.dot
@@ -2,6 +2,6 @@ digraph G {
 0 [label="samples/sample-undefined/create.sql", shape="", type=query];
 1 [label="samples/sample-undefined/insert.sql", shape="", type=query];
 2 [label="samples/sample-undefined/select.sql", shape="", type=query];
-0->2 ;
 0->1 ;
+0->2 ;
 }
diff --git a/samples/sample-undefined/dag.png b/samples/sample-undefined/dag.png
index aedb53da..0f86cc05 100644
Binary files a/samples/sample-undefined/dag.png and b/samples/sample-undefined/dag.png differ
diff --git a/samples/sample-undefined/side_effect_first/alphadag_stdout.txt b/samples/sample-undefined/side_effect_first/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample-undefined/side_effect_first/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/side_effect_first/dag.png b/samples/sample-undefined/side_effect_first/dag.png
index 16675aff..009f95fa 100644
Binary files a/samples/sample-undefined/side_effect_first/dag.png and b/samples/sample-undefined/side_effect_first/dag.png differ
diff --git a/samples/sample-undefined/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample-undefined/side_effect_first_with_tables/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample-undefined/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/side_effect_first_with_tables/dag.png b/samples/sample-undefined/side_effect_first_with_tables/dag.png
index 8e15d2b4..54e9b8c2 100644
Binary files a/samples/sample-undefined/side_effect_first_with_tables/dag.png and b/samples/sample-undefined/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample-undefined/with_all/alphadag_stdout.txt b/samples/sample-undefined/with_all/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/with_all/alphadag_stdout.txt
+++ b/samples/sample-undefined/with_all/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/with_all/dag.dot b/samples/sample-undefined/with_all/dag.dot
index 4d922bc8..ea6d39aa 100644
--- a/samples/sample-undefined/with_all/dag.dot
+++ b/samples/sample-undefined/with_all/dag.dot
@@ -4,6 +4,6 @@ digraph G {
 2 [label="samples/sample-undefined/select.sql", shape="", type=query];
 3 [label=table_undefined, shape=box, type=table];
 0->3 ;
-3->2 ;
 3->1 ;
+3->2 ;
 }
diff --git a/samples/sample-undefined/with_all/dag.png b/samples/sample-undefined/with_all/dag.png
index 0cc3d2cd..4be52cd3 100644
Binary files a/samples/sample-undefined/with_all/dag.png and b/samples/sample-undefined/with_all/dag.png differ
diff --git a/samples/sample-undefined/with_functions/alphadag_stdout.txt b/samples/sample-undefined/with_functions/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/with_functions/alphadag_stdout.txt
+++ b/samples/sample-undefined/with_functions/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/with_functions/dag.dot b/samples/sample-undefined/with_functions/dag.dot
index 87342957..7fda856c 100644
--- a/samples/sample-undefined/with_functions/dag.dot
+++ b/samples/sample-undefined/with_functions/dag.dot
@@ -2,6 +2,6 @@ digraph G {
 0 [label="samples/sample-undefined/create.sql", shape="", type=query];
 1 [label="samples/sample-undefined/insert.sql", shape="", type=query];
 2 [label="samples/sample-undefined/select.sql", shape="", type=query];
-0->2 ;
 0->1 ;
+0->2 ;
 }
diff --git a/samples/sample-undefined/with_functions/dag.png b/samples/sample-undefined/with_functions/dag.png
index aedb53da..0f86cc05 100644
Binary files a/samples/sample-undefined/with_functions/dag.png and b/samples/sample-undefined/with_functions/dag.png differ
diff --git a/samples/sample-undefined/with_tables/alphadag_stdout.txt b/samples/sample-undefined/with_tables/alphadag_stdout.txt
index 1d2b7aa5..c2fd3045 100644
--- a/samples/sample-undefined/with_tables/alphadag_stdout.txt
+++ b/samples/sample-undefined/with_tables/alphadag_stdout.txt
@@ -1,7 +1,7 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample-undefined/select.sql"
+Reading "samples/sample-undefined/create.sql"
 Reading "samples/sample-undefined/insert.sql"
 Warning!!! the target of INSERT statement table_undefined is not created in the same script!!!
 This script is not idempotent. See https://github.com/Matts966/alphasql/issues/5#issuecomment-735209829 for more details.
-Reading "samples/sample-undefined/create.sql"
+Reading "samples/sample-undefined/select.sql"
diff --git a/samples/sample-undefined/with_tables/dag.dot b/samples/sample-undefined/with_tables/dag.dot
index 4d922bc8..ea6d39aa 100644
--- a/samples/sample-undefined/with_tables/dag.dot
+++ b/samples/sample-undefined/with_tables/dag.dot
@@ -4,6 +4,6 @@ digraph G {
 2 [label="samples/sample-undefined/select.sql", shape="", type=query];
 3 [label=table_undefined, shape=box, type=table];
 0->3 ;
-3->2 ;
 3->1 ;
+3->2 ;
 }
diff --git a/samples/sample-undefined/with_tables/dag.png b/samples/sample-undefined/with_tables/dag.png
index 0cc3d2cd..4be52cd3 100644
Binary files a/samples/sample-undefined/with_tables/dag.png and b/samples/sample-undefined/with_tables/dag.png differ
diff --git a/samples/sample/alphacheck_stdout.txt b/samples/sample/alphacheck_stdout.txt
index 8f8c1f58..963b751f 100644
--- a/samples/sample/alphacheck_stdout.txt
+++ b/samples/sample/alphacheck_stdout.txt
@@ -19,10 +19,10 @@ SUCCESS: analysis finished!
 Analyzing "samples/sample/create_mart.sql"
 DDL analyzed, adding table to catalog...
 SUCCESS: analysis finished!
-Analyzing "samples/sample/test_mart1.sql"
+Analyzing "samples/sample/test_mart3.sql"
 SUCCESS: analysis finished!
 Analyzing "samples/sample/test_mart2.sql"
 SUCCESS: analysis finished!
-Analyzing "samples/sample/test_mart3.sql"
+Analyzing "samples/sample/test_mart1.sql"
 SUCCESS: analysis finished!
 Successfully finished type check!
diff --git a/samples/sample/alphadag_stdout.txt b/samples/sample/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/alphadag_stdout.txt
+++ b/samples/sample/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/dag.dot b/samples/sample/dag.dot
index b11c1471..93aaa15c 100644
--- a/samples/sample/dag.dot
+++ b/samples/sample/dag.dot
@@ -14,12 +14,12 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
+2->5 ;
 3->6 ;
 4->6 ;
 5->6 ;
-6->9 ;
-6->8 ;
 6->7 ;
+6->8 ;
+6->9 ;
 }
diff --git a/samples/sample/dag.png b/samples/sample/dag.png
index 9e7942b9..299b0a29 100644
Binary files a/samples/sample/dag.png and b/samples/sample/dag.png differ
diff --git a/samples/sample/side_effect_first/alphadag_stdout.txt b/samples/sample/side_effect_first/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/side_effect_first/alphadag_stdout.txt
+++ b/samples/sample/side_effect_first/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/side_effect_first/dag.dot b/samples/sample/side_effect_first/dag.dot
index b11c1471..93aaa15c 100644
--- a/samples/sample/side_effect_first/dag.dot
+++ b/samples/sample/side_effect_first/dag.dot
@@ -14,12 +14,12 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
+2->5 ;
 3->6 ;
 4->6 ;
 5->6 ;
-6->9 ;
-6->8 ;
 6->7 ;
+6->8 ;
+6->9 ;
 }
diff --git a/samples/sample/side_effect_first/dag.png b/samples/sample/side_effect_first/dag.png
index 9e7942b9..299b0a29 100644
Binary files a/samples/sample/side_effect_first/dag.png and b/samples/sample/side_effect_first/dag.png differ
diff --git a/samples/sample/side_effect_first_with_tables/alphadag_stdout.txt b/samples/sample/side_effect_first_with_tables/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/sample/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/side_effect_first_with_tables/dag.dot b/samples/sample/side_effect_first_with_tables/dag.dot
index 33d28bc3..df637176 100644
--- a/samples/sample/side_effect_first_with_tables/dag.dot
+++ b/samples/sample/side_effect_first_with_tables/dag.dot
@@ -30,12 +30,12 @@ digraph G {
 11->6 ;
 12->3 ;
 12->4 ;
-13->5 ;
 13->4 ;
+13->5 ;
 14->6 ;
 15->6 ;
 16->6 ;
-17->9 ;
-17->8 ;
 17->7 ;
+17->8 ;
+17->9 ;
 }
diff --git a/samples/sample/side_effect_first_with_tables/dag.png b/samples/sample/side_effect_first_with_tables/dag.png
index f4491c38..b4828e3f 100644
Binary files a/samples/sample/side_effect_first_with_tables/dag.png and b/samples/sample/side_effect_first_with_tables/dag.png differ
diff --git a/samples/sample/with_all/alphadag_stdout.txt b/samples/sample/with_all/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/with_all/alphadag_stdout.txt
+++ b/samples/sample/with_all/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/with_all/dag.dot b/samples/sample/with_all/dag.dot
index 33d28bc3..df637176 100644
--- a/samples/sample/with_all/dag.dot
+++ b/samples/sample/with_all/dag.dot
@@ -30,12 +30,12 @@ digraph G {
 11->6 ;
 12->3 ;
 12->4 ;
-13->5 ;
 13->4 ;
+13->5 ;
 14->6 ;
 15->6 ;
 16->6 ;
-17->9 ;
-17->8 ;
 17->7 ;
+17->8 ;
+17->9 ;
 }
diff --git a/samples/sample/with_all/dag.png b/samples/sample/with_all/dag.png
index f4491c38..b4828e3f 100644
Binary files a/samples/sample/with_all/dag.png and b/samples/sample/with_all/dag.png differ
diff --git a/samples/sample/with_functions/alphadag_stdout.txt b/samples/sample/with_functions/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/with_functions/alphadag_stdout.txt
+++ b/samples/sample/with_functions/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/with_functions/dag.dot b/samples/sample/with_functions/dag.dot
index b11c1471..93aaa15c 100644
--- a/samples/sample/with_functions/dag.dot
+++ b/samples/sample/with_functions/dag.dot
@@ -14,12 +14,12 @@ digraph G {
 0->6 ;
 1->3 ;
 1->4 ;
-2->5 ;
 2->4 ;
+2->5 ;
 3->6 ;
 4->6 ;
 5->6 ;
-6->9 ;
-6->8 ;
 6->7 ;
+6->8 ;
+6->9 ;
 }
diff --git a/samples/sample/with_functions/dag.png b/samples/sample/with_functions/dag.png
index 9e7942b9..299b0a29 100644
Binary files a/samples/sample/with_functions/dag.png and b/samples/sample/with_functions/dag.png differ
diff --git a/samples/sample/with_tables/alphadag_stdout.txt b/samples/sample/with_tables/alphadag_stdout.txt
index 25457bb4..21989c65 100644
--- a/samples/sample/with_tables/alphadag_stdout.txt
+++ b/samples/sample/with_tables/alphadag_stdout.txt
@@ -1,12 +1,12 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
-Reading "samples/sample/create_interim1.sql"
-Reading "samples/sample/create_interim3.sql"
-Reading "samples/sample/create_interim2.sql"
-Reading "samples/sample/test_mart3.sql"
-Reading "samples/sample/test_mart2.sql"
-Reading "samples/sample/test_mart1.sql"
 Reading "samples/sample/create_datawarehouse1.sql"
-Reading "samples/sample/create_datawarehouse3.sql"
 Reading "samples/sample/create_datawarehouse2.sql"
+Reading "samples/sample/create_datawarehouse3.sql"
+Reading "samples/sample/create_interim1.sql"
+Reading "samples/sample/create_interim2.sql"
+Reading "samples/sample/create_interim3.sql"
 Reading "samples/sample/create_mart.sql"
+Reading "samples/sample/test_mart1.sql"
+Reading "samples/sample/test_mart2.sql"
+Reading "samples/sample/test_mart3.sql"
diff --git a/samples/sample/with_tables/dag.dot b/samples/sample/with_tables/dag.dot
index 33d28bc3..df637176 100644
--- a/samples/sample/with_tables/dag.dot
+++ b/samples/sample/with_tables/dag.dot
@@ -30,12 +30,12 @@ digraph G {
 11->6 ;
 12->3 ;
 12->4 ;
-13->5 ;
 13->4 ;
+13->5 ;
 14->6 ;
 15->6 ;
 16->6 ;
-17->9 ;
-17->8 ;
 17->7 ;
+17->8 ;
+17->9 ;
 }
diff --git a/samples/sample/with_tables/dag.png b/samples/sample/with_tables/dag.png
index f4491c38..b4828e3f 100644
Binary files a/samples/sample/with_tables/dag.png and b/samples/sample/with_tables/dag.png differ
diff --git a/samples/scripting/alphacheck_stderr.txt b/samples/scripting/alphacheck_stderr.txt
index e69de29b..ed83a147 100644
--- a/samples/scripting/alphacheck_stderr.txt
+++ b/samples/scripting/alphacheck_stderr.txt
@@ -0,0 +1 @@
+ERROR: INVALID_ARGUMENT: Procedure not found: create_datawarehouse3 [at samples/scripting/script.sql:12:8]
diff --git a/samples/scripting/alphacheck_stdout.txt b/samples/scripting/alphacheck_stdout.txt
index 68487a09..43d4c61f 100644
--- a/samples/scripting/alphacheck_stdout.txt
+++ b/samples/scripting/alphacheck_stdout.txt
@@ -1,7 +1,6 @@
 Analyzing "samples/scripting/script.sql"
 DDL analyzed, adding table to catalog...
 DDL analyzed, adding table to catalog...
-ERROR: INVALID_ARGUMENT: Procedure not found: create_datawarehouse3 [at samples/scripting/script.sql:12:8]
 catalog:
 	dataset.main
 	datawarehouse1
diff --git a/samples/scripting/alphadag_stdout.txt b/samples/scripting/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/alphadag_stdout.txt
+++ b/samples/scripting/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/dag.png b/samples/scripting/dag.png
index c332d479..c409b821 100644
Binary files a/samples/scripting/dag.png and b/samples/scripting/dag.png differ
diff --git a/samples/scripting/external_tables.txt b/samples/scripting/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/external_tables.txt
+++ b/samples/scripting/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp
diff --git a/samples/scripting/side_effect_first/alphadag_stdout.txt b/samples/scripting/side_effect_first/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/side_effect_first/alphadag_stdout.txt
+++ b/samples/scripting/side_effect_first/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/side_effect_first/dag.png b/samples/scripting/side_effect_first/dag.png
index c332d479..c409b821 100644
Binary files a/samples/scripting/side_effect_first/dag.png and b/samples/scripting/side_effect_first/dag.png differ
diff --git a/samples/scripting/side_effect_first/external_tables.txt b/samples/scripting/side_effect_first/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/side_effect_first/external_tables.txt
+++ b/samples/scripting/side_effect_first/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp
diff --git a/samples/scripting/side_effect_first_with_tables/alphadag_stdout.txt b/samples/scripting/side_effect_first_with_tables/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/side_effect_first_with_tables/alphadag_stdout.txt
+++ b/samples/scripting/side_effect_first_with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/side_effect_first_with_tables/dag.dot b/samples/scripting/side_effect_first_with_tables/dag.dot
index 4be4249b..9e0cdd1d 100644
--- a/samples/scripting/side_effect_first_with_tables/dag.dot
+++ b/samples/scripting/side_effect_first_with_tables/dag.dot
@@ -8,7 +8,6 @@ digraph G {
 6 [label=mart, shape=box, type=table];
 7 [label=tablename1, shape=box, type=table];
 8 [label=tablename2, shape=box, type=table];
-9 [label=tmp, shape=box, type=table];
 0->6 ;
 1->5 ;
 2->3 ;
@@ -17,5 +16,4 @@ digraph G {
 4->0 ;
 7->2 ;
 8->2 ;
-9->0 ;
 }
diff --git a/samples/scripting/side_effect_first_with_tables/dag.png b/samples/scripting/side_effect_first_with_tables/dag.png
index d0c02748..0a7663ba 100644
Binary files a/samples/scripting/side_effect_first_with_tables/dag.png and b/samples/scripting/side_effect_first_with_tables/dag.png differ
diff --git a/samples/scripting/side_effect_first_with_tables/external_tables.txt b/samples/scripting/side_effect_first_with_tables/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/side_effect_first_with_tables/external_tables.txt
+++ b/samples/scripting/side_effect_first_with_tables/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp
diff --git a/samples/scripting/with_all/alphadag_stdout.txt b/samples/scripting/with_all/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/with_all/alphadag_stdout.txt
+++ b/samples/scripting/with_all/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/with_all/dag.dot b/samples/scripting/with_all/dag.dot
index 4be4249b..9e0cdd1d 100644
--- a/samples/scripting/with_all/dag.dot
+++ b/samples/scripting/with_all/dag.dot
@@ -8,7 +8,6 @@ digraph G {
 6 [label=mart, shape=box, type=table];
 7 [label=tablename1, shape=box, type=table];
 8 [label=tablename2, shape=box, type=table];
-9 [label=tmp, shape=box, type=table];
 0->6 ;
 1->5 ;
 2->3 ;
@@ -17,5 +16,4 @@ digraph G {
 4->0 ;
 7->2 ;
 8->2 ;
-9->0 ;
 }
diff --git a/samples/scripting/with_all/dag.png b/samples/scripting/with_all/dag.png
index d0c02748..0a7663ba 100644
Binary files a/samples/scripting/with_all/dag.png and b/samples/scripting/with_all/dag.png differ
diff --git a/samples/scripting/with_all/external_tables.txt b/samples/scripting/with_all/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/with_all/external_tables.txt
+++ b/samples/scripting/with_all/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp
diff --git a/samples/scripting/with_functions/alphadag_stdout.txt b/samples/scripting/with_functions/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/with_functions/alphadag_stdout.txt
+++ b/samples/scripting/with_functions/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/with_functions/dag.png b/samples/scripting/with_functions/dag.png
index c332d479..c409b821 100644
Binary files a/samples/scripting/with_functions/dag.png and b/samples/scripting/with_functions/dag.png differ
diff --git a/samples/scripting/with_functions/external_tables.txt b/samples/scripting/with_functions/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/with_functions/external_tables.txt
+++ b/samples/scripting/with_functions/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp
diff --git a/samples/scripting/with_tables/alphadag_stdout.txt b/samples/scripting/with_tables/alphadag_stdout.txt
index bfb3dbaa..fc2de512 100644
--- a/samples/scripting/with_tables/alphadag_stdout.txt
+++ b/samples/scripting/with_tables/alphadag_stdout.txt
@@ -1,5 +1,5 @@
 Reading paths passed as a command line arguments...
 Only files that end with .sql or .bq are analyzed.
+Reading "samples/scripting/mart.sql"
 Reading "samples/scripting/procedure.sql"
 Reading "samples/scripting/script.sql"
-Reading "samples/scripting/mart.sql"
diff --git a/samples/scripting/with_tables/dag.dot b/samples/scripting/with_tables/dag.dot
index 4be4249b..9e0cdd1d 100644
--- a/samples/scripting/with_tables/dag.dot
+++ b/samples/scripting/with_tables/dag.dot
@@ -8,7 +8,6 @@ digraph G {
 6 [label=mart, shape=box, type=table];
 7 [label=tablename1, shape=box, type=table];
 8 [label=tablename2, shape=box, type=table];
-9 [label=tmp, shape=box, type=table];
 0->6 ;
 1->5 ;
 2->3 ;
@@ -17,5 +16,4 @@ digraph G {
 4->0 ;
 7->2 ;
 8->2 ;
-9->0 ;
 }
diff --git a/samples/scripting/with_tables/dag.png b/samples/scripting/with_tables/dag.png
index d0c02748..0a7663ba 100644
Binary files a/samples/scripting/with_tables/dag.png and b/samples/scripting/with_tables/dag.png differ
diff --git a/samples/scripting/with_tables/external_tables.txt b/samples/scripting/with_tables/external_tables.txt
index d6551a6a..43804a2d 100644
--- a/samples/scripting/with_tables/external_tables.txt
+++ b/samples/scripting/with_tables/external_tables.txt
@@ -1,3 +1,2 @@
 tablename1
 tablename2
-tmp