From 660f1910bb6ae2aed7733be30db2c7ddb9d5f351 Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Tue, 6 Jan 2026 13:29:49 -0800
Subject: [PATCH 1/5] added account object support

---
 .../com/snowflake/dlsync/ChangeManager.java   |  14 +-
 .../com/snowflake/dlsync/ScriptFactory.java   |  16 +-
 .../dependency/DependencyExtractor.java       |  71 +-------
 .../dlsync/dependency/DependencyGraph.java    |   5 +-
 .../com/snowflake/dlsync/doa/ScriptRepo.java  |  22 +--
 .../snowflake/dlsync/doa/ScriptSource.java    |  22 +--
 .../dlsync/models/MigrationScript.java        |   2 +-
 .../com/snowflake/dlsync/models/Script.java   |  34 +---
 .../snowflake/dlsync/models/StateScript.java  |  18 --
 .../snowflake/dlsync/models/TestScript.java   |  14 +-
 .../dlsync/parser/FunctionScriptParser.java   |   6 +-
 .../dlsync/parser/ParameterInjector.java      |  17 +-
 .../snowflake/dlsync/parser/SqlTokenizer.java |  21 +--
 .../dlsync/parser/TestQueryGenerator.java     |   6 +-
 .../dlsync/parser/ViewScriptParser.java       |   1 +
 .../dependency/DependencyExtractorTest.java   | 167 +++++++++---------
 .../dependency/DependencyGraphTest.java       |  30 ++--
 .../dlsync/parser/ParameterInjectorTest.java  |  10 +-
 .../dlsync/parser/SqlTokenizerTest.java       |  82 ++++-----
 19 files changed, 226 insertions(+), 332 deletions(-)
 delete mode 100644 src/main/java/com/snowflake/dlsync/models/StateScript.java

diff --git a/src/main/java/com/snowflake/dlsync/ChangeManager.java b/src/main/java/com/snowflake/dlsync/ChangeManager.java
index b4e3d1a..d361448 100644
--- a/src/main/java/com/snowflake/dlsync/ChangeManager.java
+++ b/src/main/java/com/snowflake/dlsync/ChangeManager.java
@@ -5,12 +5,10 @@
 import com.snowflake.dlsync.doa.ScriptSource;
 import com.snowflake.dlsync.models.*;
 import com.snowflake.dlsync.parser.ParameterInjector;
-import com.snowflake.dlsync.parser.TestQueryGenerator;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;
 import java.security.NoSuchAlgorithmException;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -135,12 +133,12 @@ public boolean verify() throws IOException, NoSuchAlgorithmException, SQLExcepti
 
         List<String> schemaNames = scriptRepo.getAllSchemasInDatabase(scriptRepo.getDatabaseName());
         for(String schema: schemaNames) {
-            List<Script> stateScripts = scriptRepo.getStateScriptsInSchema(schema)
+            List<SchemaScript> declarativeScripts = scriptRepo.getDeclarativeScriptsInSchema(schema)
                     .stream()
                     .filter(script -> !config.isScriptExcluded(script))
                     .collect(Collectors.toList());
 
-            for(Script script: stateScripts) {
+            for(SchemaScript script: declarativeScripts) {
                 parameterInjector.parametrizeScript(script, true);
                 Script sourceScript = sourceScripts.stream().filter(s -> s.equals(script)).findFirst().orElse(null);
                 if(sourceScript == null) {
@@ -160,7 +158,7 @@ public boolean verify() throws IOException, NoSuchAlgorithmException, SQLExcepti
         Map<String, List<MigrationScript>> groupedMigrationScripts = sourceScripts.stream()
                 .filter(script -> script instanceof MigrationScript)
                 .map(script -> (MigrationScript)script)
-                .collect(Collectors.groupingBy(Script::getObjectName));
+                .collect(Collectors.groupingBy(SchemaScript::getObjectName));
 
         for(String objectName: groupedMigrationScripts.keySet()) {
             List<MigrationScript> sameObjectMigrations = groupedMigrationScripts.get(objectName);
@@ -204,15 +202,15 @@ public void createAllScriptsFromDB(String targetSchemas) throws SQLException, IO
         }
         int count = 0;
         for(String schema: schemaNames) {
-            List<Script> scripts = scriptRepo.getAllScriptsInSchema(schema);
-            for(Script script: scripts) {
+            List<SchemaScript> scripts = scriptRepo.getAllScriptsInSchema(schema);
+            for(SchemaScript script: scripts) {
                 count++;
                 if(configTables.contains(script.getFullObjectName())) {
                     scriptRepo.addConfig(script);
                 }
                 parameterInjector.parametrizeScript(script, false);
             }
-            scriptSource.createScriptFiles(scripts);
+            scriptSource.createSchemaScriptFiles(scripts);
         }
         endSyncSuccess(ChangeType.CREATE_SCRIPT, (long)count);
 
diff --git a/src/main/java/com/snowflake/dlsync/ScriptFactory.java b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
index ef35264..0500924 100644
--- a/src/main/java/com/snowflake/dlsync/ScriptFactory.java
+++ b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
@@ -5,12 +5,12 @@
 
 @Slf4j
 public class ScriptFactory {
-    public static StateScript getStateScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
-        return new StateScript(databaseName, schemaName, objectName, objectType, content);
+    public static DeclarativeScript getDeclarativeScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
+        return new DeclarativeScript(databaseName, schemaName, objectName, objectType, content);
     }
 
-    public static StateScript getStateScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
-        return new StateScript(scriptPath, databaseName, schemaName, objectName, objectType, content);
+    public static DeclarativeScript getDeclarativeScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
+        return new DeclarativeScript(scriptPath, databaseName, schemaName, objectName, objectType, content);
     }
 
     public static MigrationScript getMigrationScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content, Long version, String author, String rollback, String verify) {
@@ -53,8 +53,12 @@ public static MigrationScript getMigrationScript(String databaseName, String sch
         return new MigrationScript(databaseName, schemaName, objectName, objectType, migration.getContent(), migration.getVersion(), migration.getAuthor(), migration.getRollback(), migration.getVerify());
     }
 
-    public static TestScript getTestScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content, Script script) {
-        return new TestScript(scriptPath, databaseName, schemaName, objectName, objectType, content, script);
+    public static TestScript getTestScript(String scriptPath, String objectName, String content, Script mainScript) {
+        if (mainScript instanceof SchemaScript) {
+            SchemaScript schemaScript = (SchemaScript) mainScript;
+            return new TestScript(scriptPath, objectName, schemaScript.getObjectType(), content, schemaScript);
+        }
+        return null;
     }
 
 }
diff --git a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
index 3b3806d..6f43c92 100644
--- a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
+++ b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
@@ -2,7 +2,6 @@
 
 import com.snowflake.dlsync.models.MigrationScript;
 import com.snowflake.dlsync.models.Script;
-import com.snowflake.dlsync.models.ScriptObjectType;
 import com.snowflake.dlsync.parser.SqlTokenizer;
 import lombok.extern.slf4j.Slf4j;
 
@@ -10,8 +9,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -32,72 +29,6 @@ public DependencyExtractor() {
     }
 
 
-    public Set<String> extractScriptDependenciesOld(Script script) {
-        if(script.getObjectType() != ScriptObjectType.VIEWS && script.getObjectType() != ScriptObjectType.FUNCTIONS ) {
-            return new HashSet<>();
-        }
-        if(script.getObjectType() == ScriptObjectType.FUNCTIONS && !Pattern.compile(FUNCTION_WITH_DEPENDENCY_REGEX).matcher(script.getContent()).find()) {
-            return new HashSet<>();
-        }
-
-        Set<String> dependencies = new HashSet<>();
-        Set<String> falseDependencies = new HashSet<>();
-        String content = script.getContent();
-        if(script.getObjectType() == ScriptObjectType.VIEWS) {
-            for (String regex : COMMENT_REGEX) {
-                content = content.replaceAll(regex, "");
-            }
-        }
-
-        for(String regex: VIEW_FALSE_POSITIVE_DEPENDENCY_REGEX) {
-            Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
-            Matcher matcher = pattern.matcher(content);
-            while (matcher.find()) {
-                String objectName = constructFullObjectName(script, matcher.group(1));
-                falseDependencies.add(objectName);
-            }
-        }
-
-        for(String regex: VIEW_DEPENDENCY_REGEX) {
-            Pattern pattern = Pattern.compile(regex);
-            Matcher matcher = pattern.matcher(content);
-            while (matcher.find()) {
-                String objectName = constructFullObjectName(script, matcher.group(1));
-                objectName = objectName.replaceAll("\"", "");
-                if(!falseDependencies.contains(objectName)) {
-                    dependencies.add(objectName);
-                }
-//                String nameTerminator = matcher.group(2);
-//                if(nameTerminator != null && nameTerminator.endsWith(",")) {
-//                    int end = matcher.end(2);
-//                    String subContent = content.substring(end);
-//                    Matcher crossJoinMather = Pattern.compile(CROSS_JOIN_DEPENDENCY).matcher(subContent);
-//                }
-
-            }
-        }
-        log.debug("For the object {} found the following dependencies: {}", script.getObjectName(), dependencies);
-        return dependencies;
-    }
-
-    private String constructFullObjectName(Script from, String partialName) {
-        String[] objectHierarchy = partialName.split("\\.");
-        String fullyQualifiedName = "%s.%s.%s";
-        if(objectHierarchy.length == 1) {
-            fullyQualifiedName = String.format("%s.%s.%s", from.getDatabaseName(), from.getSchemaName(),  objectHierarchy[0]);
-        }
-        else if(objectHierarchy.length == 2) {
-            fullyQualifiedName = String.format("%s.%s.%s", from.getDatabaseName(), objectHierarchy[0],  objectHierarchy[1]);
-        }
-        else if(objectHierarchy.length == 3) {
-            fullyQualifiedName = String.format("%s.%s.%s", objectHierarchy[0], objectHierarchy[1],  objectHierarchy[2]);
-        }
-        else {
-            log.error("Unknown dependency extracted: {} from script: {}", partialName, from);
-        }
-        return fullyQualifiedName.toUpperCase();
-    }
-
     public void addScripts(List<? extends Script> scripts) {
         this.scripts.addAll(scripts);
     }
@@ -130,7 +61,7 @@ private boolean isDependencyOf(Script dependency, Script target) {
             return false;
         }
         for(String identifier: fullIdentifiers) {
-            String fullObjectName = constructFullObjectName(target, identifier);
+            String fullObjectName = target.getFullObjectNameOfIdentifier(identifier);
             if (fullObjectName.equals(dependency.getFullObjectName())) {
                 return true;
             }
diff --git a/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java b/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
index c766574..74e7e86 100644
--- a/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
+++ b/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
@@ -1,9 +1,6 @@
 package com.snowflake.dlsync.dependency;
 
-import com.snowflake.dlsync.models.Config;
-import com.snowflake.dlsync.models.DependencyOverride;
-import com.snowflake.dlsync.models.Script;
-import com.snowflake.dlsync.models.ScriptDependency;
+import com.snowflake.dlsync.models.*;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
index 9cc7036..04a7470 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
@@ -229,15 +229,15 @@ public void createScriptObject(Script script, boolean onlyHashes) throws SQLExce
         }
 
     }
-    public List<Script> getScriptsInSchema(String schema) throws SQLException {
-        List<Script> scripts = new ArrayList<>();
+    public List<SchemaScript> getScriptsInSchema(String schema) throws SQLException {
+        List<SchemaScript> scripts = new ArrayList<>();
         for(ScriptObjectType type: ScriptObjectType.values()) {
             scripts.addAll(getScriptsInSchema(schema, type));
         }
         return scripts;
     }
 
-    public List<Script> getAllScriptsInSchema(String schema) throws SQLException {
+    public List<SchemaScript> getAllScriptsInSchema(String schema) throws SQLException {
         log.info("Getting all scripts in schema: {}", schema);
         String sql = String.format("SELECT GET_DDL('SCHEMA', '%s', true)", schema);
         log.debug("Getting all scripts using SQL: {}", sql);
@@ -251,8 +251,8 @@ public List<Script> getAllScriptsInSchema(String schema) throws SQLException {
         }
     }
 
-    public List<Script> getStateScriptsInSchema(String schema) throws SQLException {
-        List<Script> scripts = new ArrayList<>();
+    public List<SchemaScript> getDeclarativeScriptsInSchema(String schema) throws SQLException {
+        List<SchemaScript> scripts = new ArrayList<>();
         for(ScriptObjectType type: ScriptObjectType.values()) {
             if(!type.isMigration()) {
                 scripts.addAll(getScriptsInSchema(schema, type));
@@ -261,7 +261,7 @@ public List<Script> getStateScriptsInSchema(String schema) throws SQLException {
         return scripts;
     }
 
-    public List<Script> getScriptsInSchema(String schema, ScriptObjectType type) throws SQLException {
+    public List<SchemaScript> getScriptsInSchema(String schema, ScriptObjectType type) throws SQLException {
         log.debug("Getting {} type scripts in schema: {}",type, schema);
         String sql = "";
         if(type == ScriptObjectType.FUNCTIONS || type == ScriptObjectType.PROCEDURES) {
@@ -282,7 +282,7 @@ else if(type == ScriptObjectType.TABLES) {
         }
 
         log.debug("Getting all scripts using SQL: {}", sql);
-        List<Script> scripts = new ArrayList<>();
+        List<SchemaScript> scripts = new ArrayList<>();
         ResultSet resultSet = connection.createStatement().executeQuery(sql);
         while (resultSet.next()) {
             String ddlSql = "";
@@ -314,7 +314,7 @@ else if(type == ScriptObjectType.TABLES) {
                 scripts.add(script);
             }
             else {
-                Script script = ScriptFactory.getStateScript(getDatabaseName(), schema, type, scriptObjectName, content);
+                SchemaScript script = ScriptFactory.getDeclarativeScript(getDatabaseName(), schema, type, scriptObjectName, content);
                 scripts.add(script);
             }
 
@@ -323,7 +323,7 @@ else if(type == ScriptObjectType.TABLES) {
     }
 
 
-    public Script addConfig(Script script) throws SQLException {
+    public SchemaScript addConfig(SchemaScript script) throws SQLException {
         if(script.getObjectType() == ScriptObjectType.TABLES) {
             String additionalContent = String.format("SELECT * FROM %s", script.getFullObjectName());
             ResultSet resultSet = connection.createStatement().executeQuery(additionalContent);
@@ -390,10 +390,10 @@ public Script addConfig(Script script) throws SQLException {
 //        return scripts;
 //    }
 
-    public List<Script> getAllScriptsInDatabase() throws SQLException {
+    public List<SchemaScript> getAllScriptsInDatabase() throws SQLException {
         log.info("Getting all scripts for database: {}", getDatabaseName());
         List<String> schemas = getAllSchemasInDatabase(getDatabaseName());
-        List<Script> scripts = new ArrayList<>();
+        List<SchemaScript> scripts = new ArrayList<>();
         for(String schema: schemas) {
 //            for(ScriptObjectType scriptObjectType: ScriptObjectType.values()) {
 //                scripts.addAll(getScriptsInSchema(schema, scriptObjectType));
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java b/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
index 69fce53..9e361a0 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
@@ -86,9 +86,9 @@ public List<TestScript> getTestScripts(List<Script> scripts) throws IOException
             return testScripts;
     }
 
-    public List<Script> getScriptsInSchema(String database, String schema) throws IOException {
+    public List<SchemaScript> getScriptsInSchema(String database, String schema) throws IOException {
         log.info("Reading script files from schema: {}", schema);
-        List<Script> scripts = new ArrayList<>();
+        List<SchemaScript> scripts = new ArrayList<>();
         File schemaDirectory = Path.of(mainScriptDir, database, schema).toFile();
         File[] scriptTypeDirectories = schemaDirectory.listFiles();
 
@@ -97,7 +97,7 @@ public List<Script> getScriptsInSchema(String database, String schema) throws IO
                 File[] scriptFiles = scriptType.listFiles();
                 for(File file: scriptFiles) {
                     if(file.getName().toLowerCase().endsWith(".sql")){
-                       Set<Script> scriptsFromFile = SqlTokenizer.parseScript(file.getPath(), file.getName(), scriptType.getName(), Files.readString(file.toPath()));
+                       Set<SchemaScript> scriptsFromFile = SqlTokenizer.parseSchemaScript(file.getPath(), file.getName(), scriptType.getName(), Files.readString(file.toPath()));
                        scripts.addAll(scriptsFromFile);
                     }
                     else {
@@ -112,7 +112,7 @@ public List<Script> getScriptsInSchema(String database, String schema) throws IO
         return scripts;
     }
 
-    public Set<Script> buildScriptFromFile(File file, File scriptType) throws IOException {
+    public Set<SchemaScript> buildScriptFromFile(File file, File scriptType) throws IOException {
         String content = Files.readString(file.toPath());
         String objectName = SqlTokenizer.extractObjectName(file.getName(), content);
         ScriptObjectType objectType = ScriptObjectType.valueOf(scriptType.getName());
@@ -127,7 +127,7 @@ public Set<Script> buildScriptFromFile(File file, File scriptType) throws IOExce
             log.error("Error reading script: {}, database or schema not specified", file.getName());
             throw new RuntimeException("Database, schema and object name must be provided in the script file.");
         }
-        Set<Script> scripts = new HashSet<>();
+        Set<SchemaScript> scripts = new HashSet<>();
         if(objectType.isMigration()) {
             List<Migration> migrations = SqlTokenizer.parseMigrationScripts(content);
             for(Migration migration: migrations) {
@@ -141,7 +141,7 @@ public Set<Script> buildScriptFromFile(File file, File scriptType) throws IOExce
             }
         }
         else {
-            Script script = ScriptFactory.getStateScript(file.getPath(), database, schema, objectType, objectName, content);
+            SchemaScript script = ScriptFactory.getDeclarativeScript(file.getPath(), database, schema, objectType, objectName, content);
 //            Script script = new Script(database, schema, objectType, objectName, content);
             scripts.add(script);
         }
@@ -157,21 +157,21 @@ public TestScript getTestScript(Script script) throws IOException {
         if(file.exists()) {
             log.info("Test script file found: {}", file.getPath());
             String content = Files.readString(file.toPath());
-            TestScript testScript = ScriptFactory.getTestScript(file.getPath(), script.getDatabaseName(), script.getSchemaName(), script.getObjectType(), objectName, content, script);
+            TestScript testScript = ScriptFactory.getTestScript(file.getPath(), objectName, content, script);
             return testScript;
         }
         return null;
 
     }
 
-    public void createScriptFiles(List<Script> scripts) {
+    public void createSchemaScriptFiles(List<SchemaScript> scripts) {
         log.debug("Creating script files for the scripts: {}", scripts);
-        for(Script script: scripts) {
-            createScriptFile(script);
+        for(SchemaScript script: scripts) {
+            createSchemaScriptFile(script);
         }
     }
 
-    public void createScriptFile(Script script) {
+    public void createSchemaScriptFile(SchemaScript script) {
         try {
             String scriptFileName = script.getObjectName() + ".SQL";
             String scriptDirectoryPath = String.format("%s/%s/%s/%s", mainScriptDir, script.getDatabaseName(), script.getSchemaName(), script.getObjectType());
diff --git a/src/main/java/com/snowflake/dlsync/models/MigrationScript.java b/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
index eac1620..8e4b2f0 100644
--- a/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
+++ b/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
@@ -1,6 +1,6 @@
 package com.snowflake.dlsync.models;
 
-public class MigrationScript extends Script {
+public class MigrationScript extends SchemaScript {
 
     private Long version;
     private String author;
diff --git a/src/main/java/com/snowflake/dlsync/models/Script.java b/src/main/java/com/snowflake/dlsync/models/Script.java
index f242ada..7f18c80 100644
--- a/src/main/java/com/snowflake/dlsync/models/Script.java
+++ b/src/main/java/com/snowflake/dlsync/models/Script.java
@@ -1,26 +1,18 @@
-
-
 package com.snowflake.dlsync.models;
 
 import com.snowflake.dlsync.Util;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.Objects;
 
-@Slf4j
 public abstract class Script {
     private String scriptPath;
-    private String databaseName;
-    private String schemaName;
     private String objectName;
     private ScriptObjectType objectType;
     private String content;
     private String hash;
 
-    public Script(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content) {
+    public Script(String scriptPath, String objectName, ScriptObjectType objectType, String content) {
         this.scriptPath = scriptPath;
-        this.databaseName = databaseName.toUpperCase();
-        this.schemaName = schemaName.toUpperCase();
         this.objectName = objectName.toUpperCase();
         this.objectType = objectType;
         this.content = content.trim();
@@ -31,22 +23,6 @@ public String getScriptPath() {
         return scriptPath;
     }
 
-    public String getDatabaseName() {
-        return databaseName;
-    }
-
-    public void setDatabaseName(String databaseName) {
-        this.databaseName = databaseName.toUpperCase();
-    }
-
-    public String getSchemaName() {
-        return schemaName;
-    }
-
-    public void setSchemaName(String schemaName) {
-        this.schemaName = schemaName.toUpperCase();
-    }
-
     public String getObjectName() {
         return objectName;
     }
@@ -79,10 +55,6 @@ public void setHash(String hash) {
         this.hash = hash;
     }
 
-    public String getFullObjectName() {
-        return String.format("%s.%s.%s", databaseName, schemaName, objectName);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -100,6 +72,10 @@ public int hashCode() {
     public String toString() {
         return getId();
     }
+
     public abstract String getId();
 
+    public abstract String getFullObjectName();
+
+    public abstract String getFullObjectNameOfIdentifier(String partialName);
 }
diff --git a/src/main/java/com/snowflake/dlsync/models/StateScript.java b/src/main/java/com/snowflake/dlsync/models/StateScript.java
deleted file mode 100644
index acb7676..0000000
--- a/src/main/java/com/snowflake/dlsync/models/StateScript.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.snowflake.dlsync.models;
-
-public class StateScript extends Script {
-
-
-    public StateScript(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content) {
-        super(scriptPath, databaseName, schemaName, objectName, objectType, content);
-    }
-    public StateScript(String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content) {
-        this(null, databaseName, schemaName, objectName, objectType, content);
-    }
-
-
-    @Override
-    public String getId() {
-        return getFullObjectName();
-    }
-}
diff --git a/src/main/java/com/snowflake/dlsync/models/TestScript.java b/src/main/java/com/snowflake/dlsync/models/TestScript.java
index c7d2640..ac629f1 100644
--- a/src/main/java/com/snowflake/dlsync/models/TestScript.java
+++ b/src/main/java/com/snowflake/dlsync/models/TestScript.java
@@ -8,8 +8,8 @@ public class TestScript extends Script {
     private Script mainScript;
     private TestQueryGenerator testQueryGenerator;
 
-    public TestScript(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content, Script mainScript) {
-        super(scriptPath, databaseName, schemaName, objectName, objectType, content);
+    public TestScript(String scriptPath, String objectName, ScriptObjectType objectType, String content, Script mainScript) {
+        super(scriptPath, objectName, objectType, content);
         this.mainScript = mainScript;
         this.testQueryGenerator = new TestQueryGenerator(this);
     }
@@ -26,4 +26,14 @@ public String getTestQuery() throws IOException {
     public String getId() {
         return mainScript.getId() + "_TEST";
     }
+
+    @Override
+    public String getFullObjectName() {
+        return mainScript.getFullObjectName() + "_TEST";
+    }
+
+    @Override
+    public String getFullObjectNameOfIdentifier(String partialName) {
+        return mainScript.getFullObjectNameOfIdentifier(partialName);
+    }
 }
diff --git a/src/main/java/com/snowflake/dlsync/parser/FunctionScriptParser.java b/src/main/java/com/snowflake/dlsync/parser/FunctionScriptParser.java
index 269cfba..3c25c0f 100644
--- a/src/main/java/com/snowflake/dlsync/parser/FunctionScriptParser.java
+++ b/src/main/java/com/snowflake/dlsync/parser/FunctionScriptParser.java
@@ -1,13 +1,9 @@
 package com.snowflake.dlsync.parser;
 
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
-import com.snowflake.dlsync.parser.antlr.SnowflakeLexer;
 import com.snowflake.dlsync.parser.antlr.SnowflakeParser;
 import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 @Slf4j
 public class FunctionScriptParser extends ScriptParser {
diff --git a/src/main/java/com/snowflake/dlsync/parser/ParameterInjector.java b/src/main/java/com/snowflake/dlsync/parser/ParameterInjector.java
index 467b860..e727f07 100644
--- a/src/main/java/com/snowflake/dlsync/parser/ParameterInjector.java
+++ b/src/main/java/com/snowflake/dlsync/parser/ParameterInjector.java
@@ -1,6 +1,7 @@
 package com.snowflake.dlsync.parser;
 
 import com.snowflake.dlsync.models.MigrationScript;
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import lombok.extern.slf4j.Slf4j;
 
@@ -79,8 +80,13 @@ public void parametrizeScript(Script script, boolean parametrizeObjectName){
 
     public void parameterizeObjectName(Script script) {
 //        String objectName = script.getObjectName();
-        String schemaName = script.getSchemaName();
-        String databaseName = script.getDatabaseName();
+
+        String schemaName = "";
+        String databaseName = "";
+        if(script instanceof SchemaScript) {
+            schemaName = ((SchemaScript) script).getSchemaName();
+            databaseName = ((SchemaScript) script).getDatabaseName();
+        }
 
         List<String> parameterKeys = parameters.stringPropertyNames().stream().sorted().collect(Collectors.toList());
         for(String parameter: parameterKeys) {
@@ -94,8 +100,11 @@ public void parameterizeObjectName(Script script) {
 
         String oldName = script.getFullObjectName();
 //        script.setObjectName(objectName);
-        script.setSchemaName(schemaName);
-        script.setDatabaseName(databaseName);
+        if (script instanceof SchemaScript) {
+            ((SchemaScript) script).setSchemaName(schemaName);
+            ((SchemaScript) script).setDatabaseName(databaseName);
+        }
+
         log.debug("Parametrize object name Changed from {} to {}", oldName, script.getFullObjectName());
     }
 
diff --git a/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java b/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
index 5aef267..49ce402 100644
--- a/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
+++ b/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
@@ -1,19 +1,12 @@
 package com.snowflake.dlsync.parser;
 
 import com.snowflake.dlsync.ScriptFactory;
-import com.snowflake.dlsync.models.Migration;
-import com.snowflake.dlsync.models.MigrationScript;
-import com.snowflake.dlsync.models.Script;
-import com.snowflake.dlsync.models.ScriptObjectType;
+import com.snowflake.dlsync.models.*;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 @Slf4j
 public class SqlTokenizer {
@@ -62,7 +55,7 @@ public static List<Migration> parseMigrationScripts(String content) {
         return migrations;
     }
 
-    public static Set<Script> parseScript(String filePath, String name, String scriptType, String content) {
+    public static Set<SchemaScript> parseSchemaScript(String filePath, String name, String scriptType, String content) {
         String objectName = SqlTokenizer.extractObjectName(name, content);
         Optional<ScriptObjectType> optionalObjectType = Arrays.stream(ScriptObjectType.values()).filter( type -> type.toString().equalsIgnoreCase(scriptType)).findFirst();
         if(!optionalObjectType.isPresent()) {
@@ -81,7 +74,7 @@ public static Set<Script> parseScript(String filePath, String name, String scrip
             log.error("Error reading script: {}, database or schema not specified", name);
             throw new RuntimeException("Database, schema and object name must be provided in the script file.");
         }
-        Set<Script> scripts = new HashSet<>();
+        Set<SchemaScript> scripts = new HashSet<>();
         if(objectType.isMigration()) {
             List<Migration> migrations = SqlTokenizer.parseMigrationScripts(content);
             if(migrations.isEmpty()) {
@@ -98,7 +91,7 @@ public static Set<Script> parseScript(String filePath, String name, String scrip
             }
         }
         else {
-            Script script = ScriptFactory.getStateScript(filePath, database, schema, objectType, objectName, content);
+            SchemaScript script = ScriptFactory.getDeclarativeScript(filePath, database, schema, objectType, objectName, content);
 //            Script script = new Script(database, schema, objectType, objectName, content);
             scripts.add(script);
         }
@@ -243,9 +236,9 @@ public static Set<String> getFullIdentifiers(String name, String content) {
         return fullIdentifiers;
     }
 
-    public static List<Script> parseDdlScripts(String ddl, String database, String schema) {
+    public static List<SchemaScript> parseDdlScripts(String ddl, String database, String schema) {
         Matcher matcher = Pattern.compile(DDL_REGEX, Pattern.CASE_INSENSITIVE).matcher(ddl);
-        List<Script> scripts = new ArrayList<>();
+        List<SchemaScript> scripts = new ArrayList<>();
         log.debug("parsing ddl scripts {}", ddl);
         while(matcher.find()) {
             String content = matcher.group(1) + ";";
@@ -268,7 +261,7 @@ public static List<Script> parseDdlScripts(String ddl, String database, String s
                 MigrationScript script = ScriptFactory.getMigrationScript(database, schema, objectType, scriptObjectName, content);
                 scripts.add(script);
             } else {
-                Script script = ScriptFactory.getStateScript(database, schema, objectType, scriptObjectName, content);
+                SchemaScript script = ScriptFactory.getDeclarativeScript(database, schema, objectType, scriptObjectName, content);
                 scripts.add(script);
             }
         }
diff --git a/src/main/java/com/snowflake/dlsync/parser/TestQueryGenerator.java b/src/main/java/com/snowflake/dlsync/parser/TestQueryGenerator.java
index 6880124..7622670 100644
--- a/src/main/java/com/snowflake/dlsync/parser/TestQueryGenerator.java
+++ b/src/main/java/com/snowflake/dlsync/parser/TestQueryGenerator.java
@@ -1,13 +1,9 @@
 package com.snowflake.dlsync.parser;
 
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import com.snowflake.dlsync.models.TestScript;
-import com.snowflake.dlsync.parser.antlr.*;
 import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/com/snowflake/dlsync/parser/ViewScriptParser.java b/src/main/java/com/snowflake/dlsync/parser/ViewScriptParser.java
index e440ccb..79cc57d 100644
--- a/src/main/java/com/snowflake/dlsync/parser/ViewScriptParser.java
+++ b/src/main/java/com/snowflake/dlsync/parser/ViewScriptParser.java
@@ -1,5 +1,6 @@
 package com.snowflake.dlsync.parser;
 
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import com.snowflake.dlsync.parser.antlr.SnowflakeParser;
 
diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
index 6b65e9d..09b3a3d 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
@@ -1,6 +1,7 @@
 package com.snowflake.dlsync.dependency;
 
 import com.snowflake.dlsync.ScriptFactory;
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import com.snowflake.dlsync.models.ScriptObjectType;
 import org.junit.jupiter.api.AfterEach;
@@ -27,39 +28,39 @@ void setUp() {
     void tearDown() {
     }
 
-    List<Script> mockScripts(String name, String schema, String... contents) {
-        List<Script> scripts = new ArrayList<>();
+    List<SchemaScript> mockScripts(String name, String schema, String... contents) {
+        List<SchemaScript> scripts = new ArrayList<>();
         for(int i = 0; i < contents.length; i++) {
-            Script script = ScriptFactory.getStateScript("TEST_DB", schema, ScriptObjectType.VIEWS, name + i, contents[i]);
+            SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.VIEWS, name + i, contents[i]);
             scripts.add(script);
         }
         return scripts;
 
     }
 
-    List<Script> mockScripts() {
+    List<SchemaScript> mockScripts() {
         String[] contents = {"CREATE OR REPLACE MOCK1 AS SELECT * FROM TABLE1;", "CREATE OR REPLACE TEST_SCHEMA.MOCK2 AS SELECT * FROM MOCK1;", "CREATE OR REPLACE TEST_DB.TEST_SCHEMA.MOCK3 AS SELECT * FROM MOCK1 UNION SELECT * FROM MOCK2;"};
-        List<Script> mock = mockScripts("MOCK", "TEST_SCHEMA", contents);
+        List<SchemaScript> mock = mockScripts("MOCK", "TEST_SCHEMA", contents);
         mock.addAll(mockNotDependency());
         return mock;
     }
 
-    List<Script> mockNotDependency() {
+    List<SchemaScript> mockNotDependency() {
         String[] contents = {"CREATE OR REPLACE NOT_DEPENDENCY1 AS SELECT * FROM TABLE1;", "CREATE OR REPLACE TEST_SCHEMA.NOT_DEPENDENCY2 AS SELECT * FROM MOCK1;", "CREATE OR REPLACE TEST_DB.TEST_SCHEMA.NOT_DEPENDENCY3 AS SELECT * FROM MOCK1 UNION SELECT * FROM MOCK2;"};
         return mockScripts("NOT_DEPENDENCY", "TEST_SCHEMA", contents);
     }
 
-    Script mockViewDependency(String name, String schema) {
+    SchemaScript mockViewDependency(String name, String schema) {
         String content = "CREATE OR REPLACE VIEW " + name + " AS SELECT * FROM  TABLE1;";
-        return ScriptFactory.getStateScript("TEST_DB", schema, ScriptObjectType.VIEWS, name, content);
+        return ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.VIEWS, name, content);
     }
 
-    Script mockTableDependency(String name, String schema) {
+    SchemaScript mockTableDependency(String name, String schema) {
         String content = "CREATE OR REPLACE TABLE " + name + "(ID VARCHAR, COL1 NUMBER)";
         return ScriptFactory.getMigrationScript("TEST_DB", schema, ScriptObjectType.TABLES, name, content);
     }
 
-    Script mockUdfDependency(String name, String schema) {
+    SchemaScript mockUdfDependency(String name, String schema) {
         String content = "CREATE OR REPLACE FUNCTION " + name + "(ARG1 VARCHAR)\n" +
                 "RETURNS VARCHAR\n" +
                 "LANGUAGE JAVASCRIPT\n" +
@@ -67,19 +68,19 @@ Script mockUdfDependency(String name, String schema) {
                 "$$\n" +
                 " return ARG1.toUpperCase();\n" +
                 "$$;";
-        return ScriptFactory.getStateScript("TEST_DB", schema, ScriptObjectType.FUNCTIONS, name, content);
+        return ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.FUNCTIONS, name, content);
     }
 
     @Test
     void extractScriptDependenciesTestFrom() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  DEPENDENCY join test_schema2.not_dependency1;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -89,17 +90,17 @@ void extractScriptDependenciesTestFrom() {
     @Test
     void extractScriptDependenciesTestJoin() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  DEPENDENCY JOIN test_schema.JOIN_DEPENDENCY;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
-        Script dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
-        Script dependency2 = mockViewDependency("JOIN_DEPENDENCY", "TEST_SCHEMA");
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
+        SchemaScript dependency2 = mockViewDependency("JOIN_DEPENDENCY", "TEST_SCHEMA");
 
-        List<Script> changedScript = mockScripts();
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency2,
                 dependency1
         );
@@ -110,15 +111,15 @@ void extractScriptDependenciesTestJoin() {
     @Test
     void extractScriptDependenciesTestWithQuotedObjects() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  \"TEST_SCHEMA2\".\"DEPENDENCY\" join \"TEST_SCHEMA2\".\"NOT_DEPENDENCY1\"";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
-        Script dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA2");
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA2");
 
-        List<Script> changedScript = mockScripts();
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -137,17 +138,17 @@ void extractScriptDependenciesTestWithComments() throws IOException {
                 "SELECT * FROM NOT_DEPENDENCY2;\n" +
                 "*/\n" +
                 "DEPENDENCY3 T4 ON T4.ID = T1.ID;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
-        Script dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
-        Script dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
-        Script dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
+        SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
+        SchemaScript dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
 
-        Script notDependency1 = mockViewDependency("NOT_DEPENDENCY1", "TEST_SCHEMA");
-        Script notDependency2 = mockViewDependency("NOT_DEPENDENCY2", "TEST_SCHEMA");
+        SchemaScript notDependency1 = mockViewDependency("NOT_DEPENDENCY1", "TEST_SCHEMA");
+        SchemaScript notDependency2 = mockViewDependency("NOT_DEPENDENCY2", "TEST_SCHEMA");
 
 
-        List<Script> changedScript = mockScripts();
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
@@ -156,7 +157,7 @@ void extractScriptDependenciesTestWithComments() throws IOException {
         changedScript.add(notDependency2);
 
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency2,
                 dependency1,
                 dependency3
@@ -182,16 +183,16 @@ void extractScriptDependenciesTestWithCTE() {
                 "         ), CTE5 AS (SELECT * FROM CTE4 JOIN JOIN_DEPENDENCY3)\n" +
                 "    SELECT  * FROM CTE1 C1 JOIN CTE5 CT5 ON CT1.ID=CT5.ID JOIN JOIN_DEPENDENCY4 ON CT1.ID=CT5.ID;";
 
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
-        Script dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
-        Script dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
-        Script dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
-        Script joinDependency2 = mockViewDependency("JOIN_DEPENDENCY2", "TEST_SCHEMA");
-        Script joinDependency3 = mockViewDependency("JOIN_DEPENDENCY3", "TEST_SCHEMA");
-        Script joinDependency4 = mockViewDependency("JOIN_DEPENDENCY4", "TEST_SCHEMA");
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
+        SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
+        SchemaScript dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
+        SchemaScript joinDependency2 = mockViewDependency("JOIN_DEPENDENCY2", "TEST_SCHEMA");
+        SchemaScript joinDependency3 = mockViewDependency("JOIN_DEPENDENCY3", "TEST_SCHEMA");
+        SchemaScript joinDependency4 = mockViewDependency("JOIN_DEPENDENCY4", "TEST_SCHEMA");
 
-        List<Script> changedScript = mockScripts();
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
@@ -200,7 +201,7 @@ void extractScriptDependenciesTestWithCTE() {
         changedScript.add(joinDependency3);
         changedScript.add(joinDependency4);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1,
                 dependency2,
                 dependency3,
@@ -216,13 +217,13 @@ void extractScriptDependenciesTestWithCTE() {
     @Test
     void extractScriptDependenciesTestWithQuoted() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT 'SELECT * FROM NOT_DEPENDENCY1', * FROM  DEPENDENCY1";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -233,18 +234,18 @@ void extractScriptDependenciesTestWithQuoted() {
     @Test
     void extractScriptDependenciesTestWithAliases() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT  * FROM  DEPENDENCY1 as dp1, DEPENDENCY2 dp2, DEPENDENCY3 AS dp3 where dp1.id=dp2.id and dp2.id=dp3.id;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
-        Script dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
-        Script dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
+        SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
+        SchemaScript dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
 
-        List<Script> changedScript = mockScripts();
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
         changedScript.add(dependency3);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency2,
                 dependency1,
                 dependency3
@@ -256,13 +257,13 @@ void extractScriptDependenciesTestWithAliases() {
     @Test
     void extractScriptDependenciesWithSameObjectName() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT * FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency = mockViewDependency("VIEW1", "TEST_SCHEMA2");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency = mockViewDependency("VIEW1", "TEST_SCHEMA2");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -272,15 +273,15 @@ void extractScriptDependenciesWithSameObjectName() {
     @Test
     void extractScriptDependenciesWithUdf() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2, TEST_SCHEMA1.UDF1(COL3) AS COL4 FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
-        Script dependency2 = mockUdfDependency("UDF1", "TEST_SCHEMA1");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
+        SchemaScript dependency2 = mockUdfDependency("UDF1", "TEST_SCHEMA1");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1,
                 dependency2
         );
@@ -294,13 +295,13 @@ void extractScriptDependenciesTableWithViewDependency() {
         "---version: 0, author: dlsync\n" +
         "CREATE OR REPLACE TABLE TEST_SCHEMA.TABLE1 AS SELECT * FROM TEST_SCHEMA.VIEW1;\n";
 
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content);
-        Script dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content);
+        SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -313,15 +314,15 @@ void extractScriptDependenciesWithStringNames() {
                 "---version: 1, author: dlsync\n" +
                 "INSERT INTO TEST_SCHEMA.TABLE1 values(1, 'not_dependency1');\n";
 
-        Script script = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content, 1L, "dlsync", "", "");
-        Script dependency1 = mockTableDependency("TABLE1", "TEST_SCHEMA");
-        Script not_dependency1 = mockViewDependency("NOT_DEPENDENCY1", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content, 1L, "dlsync", "", "");
+        SchemaScript dependency1 = mockTableDependency("TABLE1", "TEST_SCHEMA");
+        SchemaScript not_dependency1 = mockViewDependency("NOT_DEPENDENCY1", "TEST_SCHEMA");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(not_dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -331,15 +332,15 @@ void extractScriptDependenciesWithStringNames() {
     @Test
     void extractScriptDependenciesIdentifierAfterEquals() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2=FUNC1(COL3) FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
-        Script dependency2 = mockUdfDependency("FUNC1", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
+        SchemaScript dependency2 = mockUdfDependency("FUNC1", "TEST_SCHEMA");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(dependency2);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1,
                 dependency2
         );
@@ -350,15 +351,15 @@ void extractScriptDependenciesIdentifierAfterEquals() {
     // TODO: Fix this failing test
     void extractScriptDependenciesWithSameName() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2 FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
-        Script dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
-        Script notDependency = mockUdfDependency("VIEW1", "TEST_SCHEMA2");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
+        SchemaScript notDependency = mockUdfDependency("VIEW1", "TEST_SCHEMA2");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(notDependency);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -371,13 +372,13 @@ void extractScriptDependenciesIdentifierInQuotes() {
                 "root_location=@TEST_SCHEMA2.STAGE1\n" +
                 "\tmain_file='/streamlit_app.py'\n" +
                 "\tquery_warehouse='${MY_WAREHOUSE}'";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA1", ScriptObjectType.STREAMLITS, "STREAMLIT_1", content);
-        Script dependency1 = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA2", ScriptObjectType.STAGES, "STAGE1", "---version: 1, author: dlsync\nCREATE OR REPLACE STAGE TEST_SCHEMA2.STAGE1;", 1L, "dlsync", "", "");
-        List<Script> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA1", ScriptObjectType.STREAMLITS, "STREAMLIT_1", content);
+        SchemaScript dependency1 = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA2", ScriptObjectType.STAGES, "STAGE1", "---version: 1, author: dlsync\nCREATE OR REPLACE STAGE TEST_SCHEMA2.STAGE1;", 1L, "dlsync", "", "");
+        List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
         changedScript.add(dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
+        Set<SchemaScript> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
index 2a5dc5b..cfb59f1 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
@@ -1,8 +1,8 @@
 package com.snowflake.dlsync.dependency;
 
-import com.snowflake.dlsync.ConfigManager;
 import com.snowflake.dlsync.ScriptFactory;
 import com.snowflake.dlsync.models.Config;
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import com.snowflake.dlsync.models.ScriptObjectType;
 import org.junit.jupiter.api.AfterEach;
@@ -37,10 +37,10 @@ void topologicalSortTest() {
         String content3 = "CREATE OR replace VIEW VIEW3 AS SELECT * FROM VIEW2;";
         String content4 = "create or replace view VIEW4 AS SELECT * FROM VIEW3;";
 
-        Script script1 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
-        Script script2 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
-        Script script3 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
-        Script script4 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
+        SchemaScript script1 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
+        SchemaScript script2 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
+        SchemaScript script3 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
+        SchemaScript script4 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
 
         dependencyGraph.addNodes(List.of(script1, script2, script3, script4));
         List<Script> expected = List.of(script1, script2, script3, script4);
@@ -61,19 +61,19 @@ void topologicalSortMultipleDependencyTest() {
         String content7 = "CREATE OR REPLACE VIEW VIEW7 AS SELECT * FROM VIEW6 V5 JOIN VIEW1 V1 ON V5.ID=V1.ID;";
         String content8 = "CREATE OR REPLACE VIEW VIEW7 AS SELECT * FROM VIEW1 WHERE ID NOT IN (SELECT ID FROM VIEW7);";
 
-        Script script1 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
-        Script script2 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
-        Script script3 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
-        Script script4 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
-        Script script5 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW5", content5);
-        Script script6 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW6", content6);
-        Script script7 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW7", content7);
-        Script script8 = ScriptFactory.getStateScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW8", content8);
+        SchemaScript script1 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
+        SchemaScript script2 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
+        SchemaScript script3 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
+        SchemaScript script4 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
+        SchemaScript script5 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW5", content5);
+        SchemaScript script6 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW6", content6);
+        SchemaScript script7 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW7", content7);
+        SchemaScript script8 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW8", content8);
 
-        List<Script> scripts = new ArrayList<>(List.of(script1, script2, script3, script4, script5, script6, script7, script8));
+        List<SchemaScript> scripts = new ArrayList<>(List.of(script1, script2, script3, script4, script5, script6, script7, script8));
         Collections.shuffle(scripts);
         dependencyGraph.addNodes(scripts);
-        List<Script> expected = List.of(script1, script2, script3, script4, script5, script6, script7, script8);
+        List<SchemaScript> expected = List.of(script1, script2, script3, script4, script5, script6, script7, script8);
 
         List<Script> actual = dependencyGraph.topologicalSort();
 
diff --git a/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java b/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
index 7fd843d..2ac921a 100644
--- a/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
@@ -1,7 +1,7 @@
 package com.snowflake.dlsync.parser;
 
 import com.snowflake.dlsync.ScriptFactory;
-import com.snowflake.dlsync.models.Script;
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.ScriptObjectType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -33,7 +33,7 @@ void tearDown() {
     @Test
     void injectParametersDontCapture() {
         String content = "create or replace view as select * from ${db}.${schema1}.table1 where db='my_db'";
-        Script script = ScriptFactory.getStateScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.injectParameters(script);
         String actual = script.getContent();
         String expected = "create or replace view as select * from TEST_DB.test_schema_1.table1 where db='my_db'";
@@ -43,7 +43,7 @@ void injectParametersDontCapture() {
     @Test
     void injectParametersTest() {
         String content = "create or replace view as select * from ${db}.${schema1}.table1 tb1 join test_${profile} tp on tp.id=tb1.id where tenant = '${tenant_id}'";
-        Script script = ScriptFactory.getStateScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.injectParameters(script);
         String actual = script.getContent();
         String expected = "create or replace view as select * from TEST_DB.test_schema_1.table1 tb1 join test_dev tp on tp.id=tb1.id where tenant = 'test_tenant_id'";
@@ -53,7 +53,7 @@ void injectParametersTest() {
     @Test
     void parametrizeScriptTest() {
         String content = "create or replace view as select * from TEST_DB.test_schema_1.table1 where tenant = 'test_tenant_id'";
-        Script script = ScriptFactory.getStateScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.parametrizeScript(script, false);
         String actual = script.getContent();
         String expected = "create or replace view as select * from ${db}.${schema1}.table1 where tenant = '${tenant_id}'";
@@ -63,7 +63,7 @@ void parametrizeScriptTest() {
     @Test
     void parameterizeObjectNameTest() {
         String content = "create or replace view as select * from TEST_DB.test_schema_1.table1 where tenant = 'test_tenant_id'";
-        Script script = ScriptFactory.getStateScript("TEST_DB", "test_schema_1", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "test_schema_1", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.parameterizeObjectName(script);
         String actual = script.getFullObjectName();
         String expected = "${DB}.${SCHEMA1}.VIEW1";
diff --git a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
index f831c0a..17225da 100644
--- a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
@@ -3,7 +3,7 @@
 import com.snowflake.dlsync.ScriptFactory;
 import com.snowflake.dlsync.models.Migration;
 import com.snowflake.dlsync.models.MigrationScript;
-import com.snowflake.dlsync.models.Script;
+import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.ScriptObjectType;
 import org.junit.jupiter.api.Test;
 
@@ -210,16 +210,16 @@ void parseDdlScriptsTest() {
                 "AS '" +
                 "return arg1.trim();\n"+
                 "';";
-        List<Script> actual = SqlTokenizer.parseDdlScripts(ddl, "db1", "schema1");
-        List<Script> expected = List.of(
-                ScriptFactory.getStateScript("db1", "schema1", ScriptObjectType.VIEWS, "view1","create or replace view db1.schema1.view1 as select * from table1;"),
+        List<SchemaScript> actual = SqlTokenizer.parseDdlScripts(ddl, "db1", "schema1");
+        List<SchemaScript> expected = List.of(
+                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.VIEWS, "view1","create or replace view db1.schema1.view1 as select * from table1;"),
                 ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table1","create or replace table db1.schema1.table1 (col1 varchar, col2 number);"),
                 ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table2","create or replace transient table db1.schema1.table2 (col1 varchar, col2 number);"),
                 ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table3","create or replace hybrid table db1.schema1.table3 (col1 varchar, col2 number);"),
                 ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "\"table4\"","create or replace table db1.schema1.\"table4\" (col1 varchar, col2 number);"),
                 ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.DYNAMIC_TABLES, "dynamic_table1","create or replace dynamic table db1.schema1.dynamic_table1 (col1 varchar, col2 number)\n as SELECT id, name, COUNT(*) as count FROM db1.schema1.source_table GROUP BY id, name;"),
-                ScriptFactory.getStateScript("db1", "schema1", ScriptObjectType.MASKING_POLICIES, "masking_policy1","create or replace masking policy db1.schema1.masking_policy1 as (val string) returns string -> case when current_role() in ('ANALYST_ROLE', 'PUBLIC') then val else '****' end;"),
-                ScriptFactory.getStateScript("db1", "schema1", ScriptObjectType.FUNCTIONS, "function1","create or replace function db1.schema1.function1(arg1 varchar)\n" +
+                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.MASKING_POLICIES, "masking_policy1","create or replace masking policy db1.schema1.masking_policy1 as (val string) returns string -> case when current_role() in ('ANALYST_ROLE', 'PUBLIC') then val else '****' end;"),
+                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.FUNCTIONS, "function1","create or replace function db1.schema1.function1(arg1 varchar)\n" +
                         "RETURNS VARCHAR(16777216)\n" +
                         "LANGUAGE JAVASCRIPT\n" +
                         "AS '" +
@@ -290,18 +290,18 @@ void removeStringLiterals() {
     }
 
     @Test
-    void parseScriptTypeView() {
+    void parseSchemaScriptTypeView() {
         String filePath = "db_scripts/db1/schema1/VIEWS/VIEW1.SQL";
         String name = "VIEW1.SQL";
         String scriptType = "VIEWS";
         String content = "CREATE OR REPLACE VIEW db1.schema1.VIEW1 AS SELECT * FROM table1;";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("VIEW1", script.getObjectName(), "Object name should be VIEW1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -310,18 +310,18 @@ void parseScriptTypeView() {
     }
 
     @Test
-    void parseScriptTypeFunction() {
+    void parseSchemaScriptTypeFunction() {
         String filePath = "db_scripts/db1/schema1/FUNCTIONS/FUNCTION1.SQL";
         String name = "FUNCTION1.SQL";
         String scriptType = "FUNCTIONS";
         String content = "CREATE OR REPLACE FUNCTION db1.schema1.FUNCTION1() RETURNS STRING LANGUAGE JAVASCRIPT AS 'return \"Hello\";';";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("FUNCTION1", script.getObjectName(), "Object name should be FUNCTION1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -330,18 +330,18 @@ void parseScriptTypeFunction() {
     }
 
     @Test
-    void parseScriptTypeProcedure() {
+    void parseSchemaScriptTypeProcedure() {
         String filePath = "db_scripts/db1/schema1/PROCEDURES/PROCEDURE1.SQL";
         String name = "PROCEDURE1.SQL";
         String scriptType = "PROCEDURES";
         String content = "CREATE OR REPLACE PROCEDURE db1.schema1.PROCEDURE1() RETURNS STRING LANGUAGE JAVASCRIPT AS 'return \"Hello\";';";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("PROCEDURE1", script.getObjectName(), "Object name should be PROCEDURE1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -350,18 +350,18 @@ void parseScriptTypeProcedure() {
     }
 
     @Test
-    void parseScriptTypeFileFormat() {
+    void parseSchemaScriptTypeFileFormat() {
         String filePath = "db_scripts/db1/schema1/FILE_FORMATS/FILE_FORMAT1.SQL";
         String name = "FILE_FORMAT1.SQL";
         String scriptType = "FILE_FORMATS";
         String content = "CREATE OR REPLACE FILE FORMAT db1.schema1.FILE_FORMAT1 TYPE = 'CSV';";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("FILE_FORMAT1", script.getObjectName(), "Object name should be FILE_FORMAT1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -370,7 +370,7 @@ void parseScriptTypeFileFormat() {
     }
 
     @Test
-    void parseScriptTypeTable() {
+    void parseSchemaScriptTypeTable() {
         String filePath = "db_scripts/db1/schema1/TABLES/TABLE1.SQL";
         String name = "TABLE1.SQL";
         String scriptType = "TABLES";
@@ -381,7 +381,7 @@ void parseScriptTypeTable() {
 
         String expected_rollback = "drop table db1.schema1.TABLE1;";
         String expected_verify = "select * from db1.schema1.TABLE1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -398,7 +398,7 @@ void parseScriptTypeTable() {
     }
 
     @Test
-    void parseScriptTypeStream() {
+    void parseSchemaScriptTypeStream() {
         String filePath = "db_scripts/db1/schema1/STREAMS/STREAM1.SQL";
         String name = "STREAM1.SQL";
         String scriptType = "STREAMS";
@@ -410,7 +410,7 @@ void parseScriptTypeStream() {
 
         String expected_rollback = "drop stream db1.schema1.STREAM1;";
         String expected_verify = "select * from db1.schema1.STREAM1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -427,7 +427,7 @@ void parseScriptTypeStream() {
     }
 
     @Test
-    void parseScriptTypeSequence() {
+    void parseSchemaScriptTypeSequence() {
         String filePath = "db_scripts/db1/schema1/SEQUENCES/SEQUENCE1.SQL";
         String name = "SEQUENCE1.SQL";
         String scriptType = "SEQUENCES";
@@ -438,7 +438,7 @@ void parseScriptTypeSequence() {
 
         String expected_rollback = "drop sequence db1.schema1.SEQUENCE1;";
         String expected_verify = "select * from db1.schema1.SEQUENCE1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -455,7 +455,7 @@ void parseScriptTypeSequence() {
     }
 
     @Test
-    void parseScriptTypeStage() {
+    void parseSchemaScriptTypeStage() {
         String filePath = "db_scripts/db1/schema1/STAGES/STAGE1.SQL";
         String name = "STAGE1.SQL";
         String scriptType = "STAGES";
@@ -466,7 +466,7 @@ void parseScriptTypeStage() {
 
         String expected_rollback = "drop stage db1.schema1.STAGE1;";
         String expected_verify = "list @db1.schema1.STAGE1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -483,7 +483,7 @@ void parseScriptTypeStage() {
     }
 
     @Test
-    void parseScriptTypeTask() {
+    void parseSchemaScriptTypeTask() {
         String filePath = "db_scripts/db1/schema1/TASKS/TASK1.SQL";
         String name = "TASK1.SQL";
         String scriptType = "TASKS";
@@ -494,7 +494,7 @@ void parseScriptTypeTask() {
 
         String expected_rollback = "drop task db1.schema1.TASK1;";
         String expected_verify = "select * from db1.schema1.TASK1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -511,7 +511,7 @@ void parseScriptTypeTask() {
     }
 
     @Test
-    void parseScriptTypeStreamlit() {
+    void parseSchemaScriptTypeStreamlit() {
         String filePath = "db_scripts/db1/schema1/STREAMLITS/STREAMLIT1.SQL";
         String name = "STREAMLIT1.SQL";
         String scriptType = "STREAMLITS";
@@ -520,12 +520,12 @@ void parseScriptTypeStreamlit() {
                 "\tmain_file='/streamlit_app.py'\n" +
                 "\tquery_warehouse='${MY_WAREHOUSE}';";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("STREAMLIT1", script.getObjectName(), "Object name should be STREAMLIT1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -535,7 +535,7 @@ void parseScriptTypeStreamlit() {
     }
 
     @Test
-    void parseScriptTypePipe() {
+    void parseSchemaScriptTypePipe() {
         String filePath = "db_scripts/db1/schema1/PIPES/PIPE1.SQL";
         String name = "PIPE1.SQL";
         String scriptType = "PIPES";
@@ -546,12 +546,12 @@ void parseScriptTypePipe() {
                          "  FROM @my_stage/file_prefix\n" +
                          "  FILE_FORMAT = (TYPE = 'CSV');";
     
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
     
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
     
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("PIPE1", script.getObjectName(), "Object name should be PIPE1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -560,7 +560,7 @@ void parseScriptTypePipe() {
     }
 
     @Test
-    void parseScriptTypeDynamicTable() {
+    void parseSchemaScriptTypeDynamicTable() {
         String filePath = "db_scripts/db1/schema1/DYNAMIC_TABLES/DYNAMIC_TABLE1.SQL";
         String name = "DYNAMIC_TABLE1.SQL";
         String scriptType = "DYNAMIC_TABLES";
@@ -574,7 +574,7 @@ void parseScriptTypeDynamicTable() {
 
         String expected_rollback = "drop dynamic table db1.schema1.DYNAMIC_TABLE1;";
         String expected_verify = "select * from db1.schema1.DYNAMIC_TABLE1;";
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
@@ -591,18 +591,18 @@ void parseScriptTypeDynamicTable() {
     }
 
     @Test
-    void parseScriptTypeMaskingPolicy() {
+    void parseSchemaScriptTypeMaskingPolicy() {
         String filePath = "db_scripts/db1/schema1/MASKING_POLICIES/EMAIL_MASK.SQL";
         String name = "EMAIL_MASK.SQL";
         String scriptType = "MASKING_POLICIES";
         String content = "CREATE OR REPLACE MASKING POLICY db1.schema1.EMAIL_MASK AS (val STRING) RETURNS STRING -> CASE WHEN CURRENT_ROLE() IN ('ADMIN') THEN val ELSE '***MASKED***' END;";
 
-        Set<Script> scripts = SqlTokenizer.parseScript(filePath, name, scriptType, content);
+        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
         assertNotNull(scripts, "Scripts should not be null");
         assertEquals(1, scripts.size(), "There should be exactly one script parsed");
 
-        Script script = scripts.iterator().next();
+        SchemaScript script = scripts.iterator().next();
         assertEquals("EMAIL_MASK", script.getObjectName(), "Object name should be EMAIL_MASK");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -611,14 +611,14 @@ void parseScriptTypeMaskingPolicy() {
     }
 
     @Test
-    void parseScriptUnsupportedObjectType() {
+    void parseSchemaScriptUnsupportedObjectType() {
         String filePath = "db_scripts/db1/schema1/UNKNOWN/OBJECT1.SQL";
         String name = "OBJECT1.SQL";
         String scriptType = "UNKNOWN_TYPE";
         String content = "CREATE OR REPLACE UNKNOWN db1.schema1.OBJECT1;";
 
         RuntimeException exception = assertThrows(RuntimeException.class, () -> {
-            SqlTokenizer.parseScript(filePath, name, scriptType, content);
+            SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
         }, "Should throw RuntimeException for unsupported object type");
 
         assertEquals("Unknown script type of directory: UNKNOWN_TYPE", exception.getMessage(),

From 24e63d527a17aeec44e7aed438ab2f6413114f00 Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Thu, 15 Jan 2026 22:43:56 -0800
Subject: [PATCH 2/5] Added support for account level objects

---
 CHANGELOG.md                                  |   3 +
 README.md                                     | 213 ++++++++++++------
 .../API_INTEGRATIONS/AWS_API_GATEWAY.SQL      |   5 +
 .../AUTHENTICATION_POLICIES/MFA_POLICY.SQL    |   5 +
 .../main/ACCOUNT/DATABASES/${EXAMPLE_DB}.SQL  |   4 +
 .../NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL   |   4 +
 .../EMAIL_NOTIFICATION.SQL                    |   6 +
 .../PASSWORD_STRENGTH_POLICY.SQL              |   9 +
 .../RESOURCE_MONITORS/COMPUTE_MONITOR.SQL     |   5 +
 .../main/ACCOUNT/ROLES/USER_ROLE.SQL          |  14 ++
 .../SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL |   4 +
 .../SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL  |   4 +
 .../OAUTH_INTEGRATION.SQL                     |   8 +
 .../SESSION_TIMEOUT_POLICY.SQL                |   4 +
 .../STORAGE_INTEGRATIONS/S3_INTEGRATION.SQL   |   7 +
 .../main/ACCOUNT/WAREHOUSES/EXAMPLE_WH.SQL    |   8 +
 .../STREAMLITS/PRODUCT_DASH_BOARD.SQL         |   2 +-
 gradle.properties                             |   2 +-
 .../com/snowflake/dlsync/ChangeManager.java   |   8 +-
 .../com/snowflake/dlsync/ScriptFactory.java   |  63 ++++--
 .../dependency/DependencyExtractor.java       |   5 +-
 .../com/snowflake/dlsync/doa/ScriptRepo.java  | 120 +---------
 .../snowflake/dlsync/doa/ScriptSource.java    | 131 ++++++-----
 .../dlsync/models/MigrationScript.java        |  27 ++-
 .../com/snowflake/dlsync/models/Script.java   |  29 ++-
 .../dlsync/models/ScriptObjectType.java       |  47 ++--
 .../snowflake/dlsync/models/TestScript.java   |   4 +-
 .../snowflake/dlsync/parser/SqlTokenizer.java |  98 ++++++--
 .../dependency/DependencyExtractorTest.java   |  52 +++--
 .../dependency/DependencyGraphTest.java       |  24 +-
 .../dlsync/parser/ParameterInjectorTest.java  |   8 +-
 .../dlsync/parser/SqlTokenizerTest.java       | 181 +++++++--------
 32 files changed, 653 insertions(+), 451 deletions(-)
 create mode 100644 example_scripts/main/ACCOUNT/API_INTEGRATIONS/AWS_API_GATEWAY.SQL
 create mode 100644 example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
 create mode 100644 example_scripts/main/ACCOUNT/DATABASES/${EXAMPLE_DB}.SQL
 create mode 100644 example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
 create mode 100644 example_scripts/main/ACCOUNT/NOTIFICATION_INTEGRATIONS/EMAIL_NOTIFICATION.SQL
 create mode 100644 example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
 create mode 100644 example_scripts/main/ACCOUNT/RESOURCE_MONITORS/COMPUTE_MONITOR.SQL
 create mode 100644 example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
 create mode 100644 example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
 create mode 100644 example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
 create mode 100644 example_scripts/main/ACCOUNT/SECURITY_INTEGRATIONS/OAUTH_INTEGRATION.SQL
 create mode 100644 example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
 create mode 100644 example_scripts/main/ACCOUNT/STORAGE_INTEGRATIONS/S3_INTEGRATION.SQL
 create mode 100644 example_scripts/main/ACCOUNT/WAREHOUSES/EXAMPLE_WH.SQL

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edc83aa..2a8440f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # DLSync Changelog
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [3.0.0] - 2026-01-15
+### Added
+- Added support for account level objects like database, schemas, roles, warehouses etc.
 ## [2.6.1] - 2026-01-06
 ### Fixed
 - Fixed private key authentication issue with parameter names
diff --git a/README.md b/README.md
index 5e039d6..b768f84 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,12 @@
 [![release](https://img.shields.io/github/release/Snowflake-Labs/dlsync.svg?style=flat)](https://github.com/Snowflake-Labs/dlsync/releases/latest)
 ---
 ## Overview
-DLSync is a database change management tool designed to streamline the development and deployment of snowflake changes. 
-By associating each database object(view, table, udf ...) with a corresponding SQL script file, DLSync tracks every modification, ensuring efficient and accurate updates.
+DLSync is a database change management tool designed to streamline the development and deployment of Snowflake changes. 
+By associating each database object (view, table, UDF, etc.) with a corresponding SQL script file, DLSync tracks every modification, ensuring efficient and accurate updates.
 Each script can also have a corresponding test script that can be used to write unit tests for the database object. 
-. DLSync keeps track of what changes have been deployed to database 
-by using hash. Hence, DLSync is capable of identifying what scripts have changed in the current deployment.
-Using this DLSync only deploys changed script to database objects.
-DLSync also understands interdependency between different scripts, thus applies these changes
-according their dependency.
+DLSync keeps track of what changes have been deployed to the database by using a hash. Hence, DLSync is capable of identifying what scripts have changed in the current deployment.
+Because of this, DLSync only deploys changed scripts to database objects.
+DLSync also understands interdependencies between different scripts, thus applying these changes according to their dependencies.
 
 ## Table of Contents
 
@@ -21,7 +19,7 @@ according their dependency.
 1. [Key Features](#key-features)
 1. [Project structure](#project-structure)
    1. [Script content](#script-content)
-      1. [State Script](#1-state-script)
+      1. [Declarative Script](#1-declarative-script)
       1. [Migration Script](#2-migration-script)
       1. [Test Script](#3-test-script)
    1. [Configurations](#configurations)
@@ -33,30 +31,48 @@ according their dependency.
       1. [Rollback](#rollback)
       1. [Verify](#verify)
       1. [Create script](#create-script)
-1. [Tables used by this tool](#tables-used-by-this-tool)
+1. [Required Privileges](#required-privileges)
+   1. [Warehouse & Database Access](#warehouse--database-access)
+   1. [DLSync Schema (Metadata Tracking)](#dlsync-schema-metadata-tracking)
+   1. [Database-Level Objects](#database-level-objects)
+   1. [Account-Level Objects](#account-level-objects)
+1. [DLSync Metadata Tables](#dlsync-metadata-tables)
    1. [dl_sync_script_history](#dl_sync_script_history)
    1. [dl_sync_change_sync](#dl_sync_change_sync)
    1. [dl_sync_script_event](#dl_sync_script_event)
 1. [Example scripts](#example-scripts)
 
 ## Key Features 
-- Hybrid Change Management: It combines state based and migration based change management to manage database changes
-- Unique Script per object: Each object will have it's corresponding unique Script file where we can define the change to the object
-- Unit Testing: It supports unit testing where we can write test scripts for each database object.
-- Change detection: It can detect change between previous deployment and current script state.
-- Dependency resolution: It can reorder scripts based on their dependency before deploying to database.
-- Parametrization: It supports parametrization of scripts where we can define variables that change between different database instances. Each instance is associated with parameter config file, where each parameter config lists the variables and their value for that instance. 
-- Rollback: It supports rollback to previous deployment state. Rollback is very simple and intuitive. Only one needs to rollback git repository of the script and triggering rollback module.
-- Verification: It supports verify module where each database object is checked with current script to check for deployment verification or tracking out of sync database changes.
-- Script creation: It supports create script where we can create script file for each database objects.
+- Hybrid Change Management: It combines declarative and migration based change management to manage database changes
+- Account-Level and Database-Level Objects: DLSync supports both account-level objects (databases, schemas, roles, warehouses, security integrations, etc.) and database-level objects (views, tables, functions, procedures, etc.)
+- Unique Script per Object: Each object has a corresponding unique script file where you can define changes to the object
+- Unit Testing: It supports unit testing where you can write test scripts for each database object
+- Change Detection: It can detect changes between the previous deployment and the current script state
+- Dependency Resolution: It can reorder scripts based on their dependencies before deploying to the database
+- Parametrization: It supports parametrization of scripts where you can define variables that change between different database instances. Each instance is associated with a parameter config file that lists the variables and their values for that instance
+- Rollback: It supports rollback to the previous deployment state. Rollback is simple and intuitive. Only one needs to rollback the git repository of the scripts and trigger the rollback module
+- Verification: It supports a verify module where each database object is checked against the current script to verify deployment or track out-of-sync database changes
+- Script Creation: It supports creating script files for existing database objects
 
 ## Project structure
-To use this tool first create your script root directory.
+To use this tool, first create your script root directory.
 This directory will contain all scripts and configurations.
-Inside this directory create a directory structure like:
+Inside this directory, create a directory structure like this:
 ```
 /script-root                                        # Root directory for the scripts
 ├── /main                                           # Main scripts for deployment 
+│   ├── /ACCOUNT                                    # Account-level objects (databases, schemas, roles, warehouses)
+│   │   ├── /DATABASES                              # Database definitions
+│   │   │   ├── database_name_1.sql                 # Database creation script
+│   │   │   ├── database_name_2.sql                 # Database creation script
+│   │   ├── /SCHEMAS                                # Schema definitions
+│   │   │   ├── database_name_1.schema_name_1.sql   # Schema creation script (database.schema format)
+│   │   │   ├── database_name_2.schema_name_2.sql   # Schema creation script (database.schema format)
+│   │   ├── /ROLES                                  # Role definitions
+│   │   │   ├── role_name_1.sql                     # Role creation script
+│   │   │   ├── role_name_2.sql                     # Role creation script
+│   │   ├── /WAREHOUSES                             # Warehouse definitions
+│   │   │   ├── warehouse_name.sql                  # Warehouse creation script
 │   ├── /database_name_1                            # Database name 
 │   │   ├── /schema_name_1                          # database Schema name
 │   │   │   ├── /[object_type]_1                    # Database Object type like (VIEWS, FUNCTIONS, TABLES ...)
@@ -89,6 +105,12 @@ Inside this directory create a directory structure like:
 ```
 
 Where 
+- **ACCOUNT:** is a special directory for account-level objects that are not scoped to a specific database or schema. This includes:
+  - **DATABASES:** Database creation and modification scripts
+  - **SCHEMAS:** Schema creation and modification scripts (filenames should be in format `database_name.schema_name.sql`)
+  - **ROLES:** Role creation and management scripts
+  - **WAREHOUSES:** Warehouse creation and configuration scripts
+  - Other account-level objects (users, resource monitors, integrations, etc.)
 - **database_name_*:** is the database name of your project, 
 - **schema_name_*:** are schemas inside the database, 
 - **object_type:** is type of the object only 1 of the following (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, STREAMLITS, PIPES, ALERTS, DYNAMIC_TABLES, MASKING_POLICIES),
@@ -100,30 +122,45 @@ These property files should have names in the above format by replacing "format"
 where profile is the instance name of your database. you will provide the profile name in environment variable while running this tool.
 
 ### Script content
-Each object will have a single SQL to track the changes applied to the given object. The SQL file is named using the object's name. 
-For example if you have a view named `SAMPLE_VIEW` in schema `MY_SCHEMA` in database `MY_DATABASE`, then the script file should be named `SAMPLE_VIEW.SQL` and should be placed in the directory `[scripts_root]/main/MY_DATABASE/MY_SCHEMA/VIEWS/SAMPLE_VIEW.SQL`.
-The structure and content of the scripts will defer based on the type of script. This tool categorizes script in to 2 types named State script and Migration script.
-#### 1. State Script
-This type of script is used for object types of VIEWS, UDF, PROCEDURES, FILE FORMATS, PIPES AND MASKING POLICIES.
-In this type of script you define the current state(desired state) of the object.
+Each object will have a single SQL file to track the changes applied to that object. The SQL file is named using the object's name. 
+For example, if you have a view named `SAMPLE_VIEW` in schema `MY_SCHEMA` in database `MY_DATABASE`, then the script file should be named `SAMPLE_VIEW.SQL` and should be placed in the directory `[scripts_root]/main/MY_DATABASE/MY_SCHEMA/VIEWS/SAMPLE_VIEW.SQL`.
+
+**Account-level objects** (such as databases, roles, warehouses, security integrations, etc.) are placed directly in the `/ACCOUNT` directory. For example, a database creation script should be placed in `[scripts_root]/main/ACCOUNT/DATABASES/DATABASE_NAME.SQL` and a role creation script in `[scripts_root]/main/ACCOUNT/ROLES/ROLE_NAME.SQL`.
+
+> **Note:** Schema object filenames should include the database name in the format `database_name.schema_name.sql`. For example, a schema named `MY_SCHEMA` in database `MY_DATABASE` should be placed in `[scripts_root]/main/ACCOUNT/SCHEMAS/MY_DATABASE.MY_SCHEMA.SQL`. This ensures the schema name is properly extracted and associated with its parent database.
+
+The structure and content of the scripts differ based on the type of script. This tool categorizes scripts into 2 types: Declarative scripts and Migration scripts.
+#### 1. Declarative Script
+This type of script is used for object types of VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, PIPES, MASKING_POLICIES, STREAMLITS, RESOURCE_MONITORS, NETWORK_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES, API_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, and WAREHOUSES.
+In this type of script, you define the current state (desired state) of the object.
 When a change is made to the script, DLSync replaces the current object with the updated definition. 
-These types of scripts must always have `create or replace` statement. Every time you make a change to the script DLSync will replace the object with the new definition.
+These types of scripts must always have a `create or replace` statement. Every time you make a change to the script, DLSync will replace the object with the new definition.
 
-The sql file should be named with the database object name. 
-The State script file should adhere to the following rules
-1. The file name should match database object name referenced by the `create or replace` statement.
+The SQL file should be named with the database object name. 
+The Declarative script file should adhere to the following rules:
+1. The file name should match the database object name referenced by the `create or replace` statement.
 2. The file should contain only one SQL DDL script that creates and replaces the specified object.
-3. The create script should refer the object with its full qualified name (database.schema.object_name)
+3. For database-level objects, the create script should refer to the object with its fully qualified name (database.schema.object_name)
+4. For account-level objects, use the fully qualified name without database scope (e.g., just the object name for databases, roles, and warehouses)
+
+> **Note:** If the object name in the SQL script is parametrized (e.g., `SAMPLE_${TENANT}_VIEW`), the file name should also use the same parameter syntax (e.g., `SAMPLE_${TENANT}_VIEW.SQL`). This allows DLSync to correctly match the physical file with the parametrized object name during deployment across different environments.
 
 eg: view named SAMPLE_VIEW can have the following SQL statement in the `SAMPLE_VIEW.SQL` file.
 ```
-create or replace view ${MY_DB}.{MY_SCHEMA}.SAMPLE_VIEW as select * from ${MY_DB}.{MY_SECOND_SCHEMA}.MY_TABLE;
+create or replace view ${MY_DB}.${MY_SCHEMA}.SAMPLE_VIEW as select * from ${MY_DB}.${MY_SECOND_SCHEMA}.MY_TABLE;
+```
+
+eg: account-level database named MY_DATABASE can have the following SQL statement in the `MY_DATABASE.SQL` file.
+```
+create or replace database MY_DATABASE;
 ```
 #### 2. Migration Script
-This type of script is used for object types of TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS and DYNAMIC_TABLES.
-Here the script is treated as migration that will be applied to the object sequentially based on the version number. 
-This type of script contains 1 or more migration versions. One migration versions contains version number, author(optional), content (DDL or DML SQL statement) , rollback statement(optional) and verify statement(optional).
-Each migration version is immutable i.e Once the version is deployed you can not change the code of this version. Only you can add new versions.
+This type of script is used for object types of TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES and account-level objects like DATABASES, SCHEMAS, and ROLES.
+Here the script is treated as a migration that will be applied to the object sequentially based on the version number. 
+This type of script contains 1 or more migration versions. Each migration version contains a version number, author (optional), content (DDL or DML SQL statement), rollback statement (optional), and verify statement (optional).
+Each migration version is immutable—once the version is deployed, you cannot change the code of this version. You can only add new versions.
+
+> **Note:** If the object name in the SQL script is parametrized (e.g., `${MY_SCHEMA}`), the file name should also use the same parameter syntax (e.g., `${MY_SCHEMA}.SQL`). This allows DLSync to correctly match the physical file with the parametrized object name during deployment across different environments.
 
 eg: for the table named `SAMPLE_TABLE` you can have the following SQL statement in the `SAMPLE_TABLE.SQL` file.:
 ```
@@ -143,6 +180,21 @@ alter table ${MY_DB}.{MY_SCHEMA}.SAMPLE_TABLE add column my_new_column varchar;
 ---verify: select my_new_column from ${MY_DB}.{MY_SCHEMA}.SAMPLE_TABLE limit 1;
 ```
 
+eg: for the account-level role named `ANALYST` you can have the following SQL statement in the `ANALYST.SQL` file.:
+```
+---version: 0, author: admin
+create or replace role ANALYST;
+---rollback: drop role if exists ANALYST;
+
+---version: 1, author: admin
+grant role ANALYST to role ACCOUNTADMIN;
+---rollback: revoke role ANALYST from role ACCOUNTADMIN;
+
+---version: 2, author: admin
+grant create database on account to role ANALYST;
+---rollback: revoke create database on account from role ANALYST;
+```
+
 The migration script will have the following format:
 ```
 ---version: VERSION_NUMBER, author: NAME
@@ -158,24 +210,24 @@ where
 - ```VERIFY_CONTENT``` is the script that verifies the changes made by the migration script.
 
 The migration script should adhere to the following rules:
-1. Each change to database object should be wrapped in a migration format specified above.
-2. Each migration version should contain migration header (version and author) and the content of the migration(single DDL or DML script), rollback(optional) and verify (optional).
-3. migration header should start in a new line with three hyphens(---) and can contain only version and author.
-4. Version should be unique number per each script file and should be in incremental order. And it is used to order the scripts migration sequence for that object.
-5. author is optional alphanumeric characters used for informational purpose only to track who added the changes.
-6. Content of the change (migration) should be specified after migration header in a new line. And it can span multiple lines.
-7. Content should always be terminated by semi-colon (`;`). 
-8. Rollback if specified should start in a new line with `---rollback: `. The rollback script should be on a single line and must be terminated with semi-colon (;);
-9. Verify if specified should start in a new line with `---verify:`. The verify script should be on a single line and must be terminated with semi-colon (;);
+1. Each change to a database object should be wrapped in a migration format specified above.
+2. Each migration version should contain a migration header (version and author) and the content of the migration (single DDL or DML script), rollback (optional), and verify (optional).
+3. The migration header should start on a new line with three hyphens (---) and can contain only version and author.
+4. The version should be a unique number per script file and should be in incremental order. It is used to order the scripts' migration sequence for that object.
+5. The author is optional alphanumeric characters used for informational purposes only to track who added the changes.
+6. The content of the change (migration) should be specified after the migration header on a new line. It can span multiple lines.
+7. Content should always be terminated by a semicolon (`;`). 
+8. If rollback is specified, it should start on a new line with `---rollback: `. The rollback script should be on a single line and must be terminated with a semicolon (;).
+9. If verify is specified, it should start on a new line with `---verify:`. The verify script should be on a single line and must be terminated with a semicolon (;).
 10. Migration versions are immutable. Once a version is deployed, it cannot be changed. Only new versions can be added or existing versions can be rolled back.
 
 #### 3. Test Script
-This type of script is used write unit test for your scripts. You can write and execute unit tests for your database objects using this tool.
+This type of script is used to write unit tests for your scripts. You can write and execute unit tests for your database objects using this tool.
 Unit testing in DLSync allows you to validate the correctness of your database objects, such as views and UDFs, by writing test scripts. 
-Writing unit tests follows 3-step process:
-- mock your table dependencies using CTE by putting the table name as the CTE name.
-- Add expected data in the CTE, by putting `EXPECTED_DATA` as CTE name.
-- Add the query to refer to the database object with select statement.
+Writing unit tests follows a 3-step process:
+- Mock your table dependencies using CTE by putting the table name as the CTE name.
+- Add expected data in the CTE by putting `EXPECTED_DATA` as the CTE name.
+- Add the query to refer to the database object with a select statement.
 For example, if you have a view named `SAMPLE_VIEW`  with the following content:
 ```
 create or replace view ${MY_DB}.{MY_SCHEMA}.SAMPLE_VIEW as 
@@ -249,9 +301,9 @@ The test script should adhere to the following rules:
 8. At the end of the test script you should have a select statement to select the actual data from the database object.
 ### Configurations
 #### Parameter profile
-Parameter files help you define parameters that change between different database instances. This is helpful if you have variables that change between different instances (like dev, staging and prod). 
-Parameter files are defined per each instance. Parameter file are basically property files where you define parameter and their values. 
-the parameter files should be placed in the root script directory and should be named in the following format:
+Parameter files help you define parameters that change between different database instances. This is helpful if you have variables that change between different instances (like dev, staging, and prod). 
+Parameter files are defined per each instance. Parameter files are basically property files where you define parameters and their values. 
+The parameter files should be placed in the root script directory and should be named in the following format:
 ``` 
 parameter-[profile].property
 ```
@@ -301,7 +353,7 @@ The `dependencyOverride` is used to override the dependencies of the script file
 The `connection` is used to configure the connection to snowflake account. 
 **Warning: Please use the connection property for local development and experimenting. Since the config file is checked in to your git repo please avoid adding any connection information to your config file. You can provide the connection details in environment variables.**
 ### How to use this tool
-In order to run the application you need to provide the snowflake connection parameters in environment variables. The following environment variables are required to run the application:
+In order to run the application, you need to provide the Snowflake connection parameters in environment variables. The following environment variables are required to run the application:
 ```
 account=my_account  #account used for connection
 db=database  #your database
@@ -318,7 +370,7 @@ JAVA_TOOL_OPTIONS ="-Dnet.snowflake.jdbc.enableBouncyCastle=true" # This must be
 
 You also need to provide the script root directory and which profile to use. This can be provided in the command line argument or in the environment variable.
 Providing in the command line argument will override the environment variable. 
-you can provide command line option using the following:
+You can provide command line options using the following:
 ```
 dlsync deploy --script-root path/to/db_scripts --profile dev
 ```
@@ -331,6 +383,7 @@ or you can provide in environment variable as:
 script_root=path/to/db_scripts
 profile=dev
 ```
+
 There are 4 main modules (commands). Each module of the tool can be triggered from the command line argument.
 #### Deploy
 This module is used to deploy the changes to the database. It will deploy the changes to the database objects based on the script files.
@@ -357,7 +410,7 @@ dlsync test -s path/to/db_scripts -p dev
 
 #### Rollback
 This module is used to rollback changes to the previous deployment. It will rollback the changes to the database objects based on the script files. This should be triggered after you have rolled back the git repository of the script files. 
-The rollback works first by identifying the changes between the current deployment and the previous deployment. For state scripts (views, udf, stored procedures and file formats) it will replace them with the current script(i.e previous version as you have already made git rollback). 
+The rollback works first by identifying the changes between the current deployment and the previous deployment. For declarative scripts (views, udf, stored procedures and file formats) it will replace them with the current script(i.e previous version as you have already made git rollback). 
 For migration scripts it will identify the versions need to be rolled back by checking the missing versions of current scripts but have been deployed previously. Then it will use the rollback script specified in the migration version to rollback the changes. 
 This will be stored in the script history table.
 To rollback the changes use the following command:
@@ -366,7 +419,7 @@ dlsync rollback -script-root path/to/db_scripts -profile dev
 
 ```
 #### Verify
-This module is used to verify the database scripts are in sync with the current database objects. For state scripts it will compare the content of script with the DDL of the database object. 
+This module is used to verify the database scripts are in sync with the current database objects. For declarative scripts it will compare the content of script with the DDL of the database object. 
 For Migration scripts it uses the verify script provided in the migration version. if the verify script throws error, then it will mark the migration version as out of sync. Since latest migration versions can change previous versions results, it only checks the latest migration version of each script for verification.
 To verify the changes use the following command:
 ```
@@ -382,19 +435,51 @@ You can also provide the list of schemas you want to create the script files for
 ```
 dlsync create_script --script-root path/to/db_scripts --profile uat --target-schemas schema1,schema2
 ```
+## Required Privileges
+
+In order to successfully run DLSync, the Snowflake role provided in the connection configuration must have the appropriate privileges. The required privileges depend on the types of objects you are deploying.
+
+### Warehouse & Database Access
+- `GRANT USAGE ON WAREHOUSE <warehouse_name> TO ROLE MY_ROLE`: The role must have usage privileges on the specified warehouse to execute SQL statements.
+- `GRANT USAGE ON DATABASE <database_name> TO ROLE MY_ROLE`: The role must have usage privileges on the specified database to access its objects.
+- `GRANT USAGE ON SCHEMA <database_name.schema_name> TO ROLE MY_ROLE`: The role must have usage privileges on the specified schema to access its objects.
+
+### DLSync Schema (Metadata Tracking)
+The role must have privileges to create and manage DLSync tracking tables in the designated schema:
+- `GRANT CREATE TABLE ON SCHEMA <schema_name> TO ROLE MY_ROLE` **CREATE TABLE** on the DLSync schema
+> **Note:** the database and schema specified in the connection will be used to store the DLSync tracking tables.
+
+### Database-Level Objects
+For managing database-level objects (VIEWS, FUNCTIONS, PROCEDURES, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES, FILE_FORMATS, PIPES, MASKING_POLICIES), the role must have:
+- **USAGE** on the target schema
+- **CREATE** privileges for the specific object types being deployed (CREATE VIEW, CREATE FUNCTION, CREATE TABLE, etc.)
+- **ALTER** privileges on existing objects in the schema
+- **SELECT** privileges on tables (for queries and verification)
+
+### Account-Level Objects
+For managing account-level objects, the role must have:
+- **CREATE DATABASE** (for DATABASES)
+- **CREATE SCHEMA** on the target database (for SCHEMAS)
+- **CREATE ROLE** and **MANAGE GRANTS** (for ROLES)
+- **CREATE WAREHOUSE** (for WAREHOUSES)
+- **CREATE INTEGRATION** (for SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, API_INTEGRATIONS)
+- **CREATE RESOURCE MONITOR** (for RESOURCE_MONITORS)
+- **CREATE NETWORK POLICY** (for NETWORK_POLICIES)
+- **CREATE SESSION POLICY** (for SESSION_POLICIES)
+- **CREATE PASSWORD POLICY** (for PASSWORD_POLICIES)
+- **CREATE AUTHENTICATION POLICY** (for AUTHENTICATION_POLICIES)
 
-## Tables used by this tool
-DLSync stores script meta data, deployment history and logs in the database.
+## DLSync Metadata Tables
+DLSync stores script metadata, deployment history, and logs in the database.
 DLSync will depend on these tables to track the changes and deployment history. If these tables are missing from the schema and database provided in the connection parameter, then DLSync will create these tables. 
 Please make sure the role provided in the connection has the necessary privileges to create tables in the schema. 
 
-**_N.B: Since DLSync uses these tables to track the changes, it is recommended not to delete or change these tables. It is also import not change the schema of the connection. If DLSync is not able to find these tables in the schema, it will create them and assume as if it is running first time._**
+**_N.B: Since DLSync uses these tables to track the changes, it is recommended not to delete or change these tables. It is also important not to change the schema of the connection. If DLSync is not able to find these tables in the schema, it will create them and assume it is running for the first time._**
 
-This tool uses the following tables to store important information:
 ### dl_sync_script_history
-This table store the meta data for script files. It contains the following columns:
+This table stores the metadata for script files. It contains the following columns:
 ```
-script_id: # for state script the script name, for migration script script name plus the version number
+script_id: # for declarative script the script name, for migration script script name plus the version number
 object_name: the object name of the script
 object_type: the type of the object (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS)
 rollback_script: the rollback script for the migration version
@@ -432,4 +517,4 @@ created_by: the db user who added this change
 created_ts: the timestamp when was this change added
 ```
 ## Example scripts
-To explore the tool you can use the example scripts provided in the directory `example_scripts` .
+To explore the tool, you can use the example scripts provided in the `example_scripts` directory.
diff --git a/example_scripts/main/ACCOUNT/API_INTEGRATIONS/AWS_API_GATEWAY.SQL b/example_scripts/main/ACCOUNT/API_INTEGRATIONS/AWS_API_GATEWAY.SQL
new file mode 100644
index 0000000..abdefa6
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/API_INTEGRATIONS/AWS_API_GATEWAY.SQL
@@ -0,0 +1,5 @@
+CREATE OR REPLACE API INTEGRATION AWS_API_GATEWAY
+  API_PROVIDER = aws_api_gateway
+  API_AWS_ROLE_ARN = 'arn:aws:iam::123456789012:role/my_cloud_account_role'
+  API_ALLOWED_PREFIXES = ('https://xyz.execute-api.us-west-2.amazonaws.com/production')
+  ENABLED = TRUE;
diff --git a/example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL b/example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
new file mode 100644
index 0000000..330eb0d
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
@@ -0,0 +1,5 @@
+CREATE OR REPLACE AUTHENTICATION POLICY mfa_policy
+  AUTHENTICATION_METHODS = ('PASSWORD', 'KEYPAIR')
+  MFA_ENROLLMENT = 'REQUIRED'
+  CLIENT_TYPES = ('ALL')
+  COMMENT = 'Authentication policy requiring MFA';
diff --git a/example_scripts/main/ACCOUNT/DATABASES/${EXAMPLE_DB}.SQL b/example_scripts/main/ACCOUNT/DATABASES/${EXAMPLE_DB}.SQL
new file mode 100644
index 0000000..036a8bd
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/DATABASES/${EXAMPLE_DB}.SQL
@@ -0,0 +1,4 @@
+---version: 0, author: DlSync
+CREATE DATABASE IF NOT EXISTS ${EXAMPLE_DB};
+---rollback: DROP DATABASE IF EXISTS ${EXAMPLE_DB} CASCADE;
+---verify: SHOW DATABASES LIKE '${EXAMPLE_DB}';
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL b/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
new file mode 100644
index 0000000..ae617d5
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
@@ -0,0 +1,4 @@
+CREATE OR REPLACE NETWORK POLICY allow_internal_ips
+  ALLOWED_IP_LIST = ('10.0.0.0/8', '172.16.0.0/12')
+  BLOCKED_IP_LIST = ('192.168.1.100')
+  COMMENT = 'Network policy for internal access only';
diff --git a/example_scripts/main/ACCOUNT/NOTIFICATION_INTEGRATIONS/EMAIL_NOTIFICATION.SQL b/example_scripts/main/ACCOUNT/NOTIFICATION_INTEGRATIONS/EMAIL_NOTIFICATION.SQL
new file mode 100644
index 0000000..bf9df42
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/NOTIFICATION_INTEGRATIONS/EMAIL_NOTIFICATION.SQL
@@ -0,0 +1,6 @@
+CREATE OR REPLACE NOTIFICATION INTEGRATION email_notification
+  TYPE = 'EMAIL'
+  ENABLED = TRUE
+  COMMENT = 'Email notification integration for alerts';
+
+
diff --git a/example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL b/example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
new file mode 100644
index 0000000..5702989
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
@@ -0,0 +1,9 @@
+CREATE OR REPLACE PASSWORD POLICY password_strength_policy
+  PASSWORD_MIN_LENGTH = 12
+  PASSWORD_MAX_LENGTH = 256
+  PASSWORD_MIN_UPPER_CASE_CHARS = 1
+  PASSWORD_MIN_LOWER_CASE_CHARS = 1
+  PASSWORD_MIN_NUMERIC_CHARS = 1
+  PASSWORD_MIN_SPECIAL_CHARS = 1
+  PASSWORD_HISTORY = 5
+  COMMENT = 'Password policy enforcing strong passwords';
diff --git a/example_scripts/main/ACCOUNT/RESOURCE_MONITORS/COMPUTE_MONITOR.SQL b/example_scripts/main/ACCOUNT/RESOURCE_MONITORS/COMPUTE_MONITOR.SQL
new file mode 100644
index 0000000..7fd56c3
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/RESOURCE_MONITORS/COMPUTE_MONITOR.SQL
@@ -0,0 +1,5 @@
+CREATE OR REPLACE RESOURCE MONITOR compute_monitor
+  CREDIT_QUOTA = 100
+  TRIGGERS ON 50 PERCENT DO NOTIFY
+  ON 75 PERCENT DO NOTIFY
+  ON 100 PERCENT DO SUSPEND;
diff --git a/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL b/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
new file mode 100644
index 0000000..cf93ff3
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
@@ -0,0 +1,14 @@
+---version: 0, author: DlSync
+CREATE OR REPLACE ROLE USER_ROLE;
+---verify: SHOW ROLES LIKE 'USER_ROLE';
+---rollback: DROP ROLE IF EXISTS USER_ROLE;
+
+---version: 1, author: DlSync
+GRANT USAGE ON DATABASE ${EXAMPLE_DB} TO ROLE USER_ROLE;
+---verify: SHOW GRANTS TO ROLE USER_ROLE;
+---rollback: REVOKE USAGE ON DATABASE ${EXAMPLE_DB} FROM ROLE USER_ROLE;
+
+---version: 2, author: DlSync
+GRANT USAGE ON SCHEMA ${EXAMPLE_DB}.${MAIN_SCHEMA} TO ROLE USER_ROLE;
+---verify: SHOW GRANTS TO ROLE USER_ROLE;
+---rollback: REVOKE USAGE ON SCHEMA ${EXAMPLE_DB}.${MAIN_SCHEMA} FROM ROLE;
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
new file mode 100644
index 0000000..80ecbd8
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
@@ -0,0 +1,4 @@
+---version: 0, author: DlSync
+CREATE SCHEMA IF NOT EXISTS ${EXAMPLE_DB}.${AUDIT_SCHEMA};
+---rollback: DROP SCHEMA IF EXISTS ${EXAMPLE_DB}.${AUDIT_SCHEMA} CASCADE;
+---verify: SHOW SCHEMA LIKE '${EXAMPLE_DB}.${AUDIT_SCHEMA}';
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
new file mode 100644
index 0000000..642f486
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
@@ -0,0 +1,4 @@
+---version: 0, author: DlSync
+CREATE SCHEMA IF NOT EXISTS ${EXAMPLE_DB}.${MAIN_SCHEMA};
+---rollback: DROP SCHEMA IF EXISTS ${EXAMPLE_DB}.${MAIN_SCHEMA} CASCADE;
+---verify: SHOW SCHEMA LIKE '${EXAMPLE_DB}.${MAIN_SCHEMA}';
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/SECURITY_INTEGRATIONS/OAUTH_INTEGRATION.SQL b/example_scripts/main/ACCOUNT/SECURITY_INTEGRATIONS/OAUTH_INTEGRATION.SQL
new file mode 100644
index 0000000..ce6828e
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/SECURITY_INTEGRATIONS/OAUTH_INTEGRATION.SQL
@@ -0,0 +1,8 @@
+CREATE OR REPLACE SECURITY INTEGRATION oauth_integration
+  TYPE = oauth
+  ENABLED = true
+  OAUTH_CLIENT = custom
+  OAUTH_CLIENT_TYPE = 'CONFIDENTIAL'
+  OAUTH_REDIRECT_URI = 'https://localhost.com'
+  OAUTH_ISSUE_REFRESH_TOKENS = TRUE
+  OAUTH_REFRESH_TOKEN_VALIDITY = 86400;
diff --git a/example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL b/example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
new file mode 100644
index 0000000..d221931
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
@@ -0,0 +1,4 @@
+CREATE OR REPLACE SESSION POLICY session_timeout_policy
+  SESSION_IDLE_TIMEOUT_MINS = 60
+  SESSION_UI_IDLE_TIMEOUT_MINS = 15
+  COMMENT = 'Session timeout policy for security';
diff --git a/example_scripts/main/ACCOUNT/STORAGE_INTEGRATIONS/S3_INTEGRATION.SQL b/example_scripts/main/ACCOUNT/STORAGE_INTEGRATIONS/S3_INTEGRATION.SQL
new file mode 100644
index 0000000..25dbeac
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/STORAGE_INTEGRATIONS/S3_INTEGRATION.SQL
@@ -0,0 +1,7 @@
+CREATE OR REPLACE STORAGE INTEGRATION s3_integration
+  TYPE = 'EXTERNAL_STAGE'
+  ENABLED = FALSE
+  STORAGE_PROVIDER = 'S3'
+  STORAGE_AWS_ROLE_ARN = 'arn:aws:iam::123456789012:role/snowflake-role'
+  STORAGE_ALLOWED_LOCATIONS = ('s3://my-bucket/data/')
+  COMMENT = 'S3 storage integration for data ingestion';
diff --git a/example_scripts/main/ACCOUNT/WAREHOUSES/EXAMPLE_WH.SQL b/example_scripts/main/ACCOUNT/WAREHOUSES/EXAMPLE_WH.SQL
new file mode 100644
index 0000000..20ee168
--- /dev/null
+++ b/example_scripts/main/ACCOUNT/WAREHOUSES/EXAMPLE_WH.SQL
@@ -0,0 +1,8 @@
+CREATE OR REPLACE WAREHOUSE example_wh
+  WAREHOUSE_SIZE = 'XSMALL'
+  WAREHOUSE_TYPE = 'STANDARD'
+  AUTO_SUSPEND = 300
+  AUTO_RESUME = TRUE
+  INITIALLY_SUSPENDED = TRUE
+  RESOURCE_MONITOR = compute_monitor
+  COMMENT = 'Example warehouse for demonstration purposes';
\ No newline at end of file
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/STREAMLITS/PRODUCT_DASH_BOARD.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/STREAMLITS/PRODUCT_DASH_BOARD.SQL
index c6ac5b5..75edc6d 100644
--- a/example_scripts/main/example_db/MAIN_SCHEMA/STREAMLITS/PRODUCT_DASH_BOARD.SQL
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/STREAMLITS/PRODUCT_DASH_BOARD.SQL
@@ -1,4 +1,4 @@
-create or replace streamlit ${EXAMPLE_DB}.${AUDIT_SCHEMA}.PRODUCT_DASH_BOARD
+create or replace streamlit ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_DASH_BOARD
     root_location=@${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_DATA_STAGE
 	main_file='/streamlit_app.py'
 	query_warehouse='${MY_WAREHOUSE}'
diff --git a/gradle.properties b/gradle.properties
index 3dc0eb7..9b86e41 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-releaseVersion=2.6.1
\ No newline at end of file
+releaseVersion=3.0.0
\ No newline at end of file
diff --git a/src/main/java/com/snowflake/dlsync/ChangeManager.java b/src/main/java/com/snowflake/dlsync/ChangeManager.java
index d361448..e0cd743 100644
--- a/src/main/java/com/snowflake/dlsync/ChangeManager.java
+++ b/src/main/java/com/snowflake/dlsync/ChangeManager.java
@@ -12,6 +12,7 @@
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Slf4j
 public class ChangeManager {
@@ -90,7 +91,7 @@ public void rollback() throws SQLException, IOException {
         startSync(ChangeType.ROLLBACK);
         Set<String> deployedScriptIds = new HashSet<>(scriptRepo.loadScriptHash());
         scriptSource.getAllScripts().forEach(script -> deployedScriptIds.remove(script.getId()));
-        List<MigrationScript> migrations = scriptRepo.getMigrationScripts(deployedScriptIds);
+        List<MigrationScript> migrations = scriptRepo.getDeployedMigrationScripts(deployedScriptIds);
         dependencyGraph.addNodes(migrations);
 
         List<Script> changedScripts = scriptSource.getAllScripts()
@@ -133,8 +134,9 @@ public boolean verify() throws IOException, NoSuchAlgorithmException, SQLExcepti
 
         List<String> schemaNames = scriptRepo.getAllSchemasInDatabase(scriptRepo.getDatabaseName());
         for(String schema: schemaNames) {
-            List<SchemaScript> declarativeScripts = scriptRepo.getDeclarativeScriptsInSchema(schema)
+            List<SchemaScript> declarativeScripts = scriptRepo.getAllScriptsInSchema(schema)
                     .stream()
+                    .filter(script -> !script.isMigration())
                     .filter(script -> !config.isScriptExcluded(script))
                     .collect(Collectors.toList());
 
@@ -158,7 +160,7 @@ public boolean verify() throws IOException, NoSuchAlgorithmException, SQLExcepti
         Map<String, List<MigrationScript>> groupedMigrationScripts = sourceScripts.stream()
                 .filter(script -> script instanceof MigrationScript)
                 .map(script -> (MigrationScript)script)
-                .collect(Collectors.groupingBy(SchemaScript::getObjectName));
+                .collect(Collectors.groupingBy(MigrationScript::getFullObjectName));
 
         for(String objectName: groupedMigrationScripts.keySet()) {
             List<MigrationScript> sameObjectMigrations = groupedMigrationScripts.get(objectName);
diff --git a/src/main/java/com/snowflake/dlsync/ScriptFactory.java b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
index 0500924..ae034f0 100644
--- a/src/main/java/com/snowflake/dlsync/ScriptFactory.java
+++ b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
@@ -3,25 +3,34 @@
 import com.snowflake.dlsync.models.*;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 public class ScriptFactory {
-    public static DeclarativeScript getDeclarativeScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
-        return new DeclarativeScript(databaseName, schemaName, objectName, objectType, content);
+
+    public static AccountScript getAccountScript(String scriptPath, ScriptObjectType objectType, String objectName, String content) {
+        return new AccountScript(scriptPath, objectName, objectType, content);
     }
 
-    public static DeclarativeScript getDeclarativeScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
-        return new DeclarativeScript(scriptPath, databaseName, schemaName, objectName, objectType, content);
+    public static SchemaScript getSchemaScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
+        return new SchemaScript(scriptPath, databaseName, schemaName, objectName, objectType, content);
     }
 
-    public static MigrationScript getMigrationScript(String scriptPath, String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content, Long version, String author, String rollback, String verify) {
-        return new MigrationScript(scriptPath, databaseName, schemaName, objectName, objectType, content, version, author, rollback, verify);
+    public static SchemaScript getSchemaScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content) {
+        return getSchemaScript(null, databaseName, schemaName, objectType, objectName, content);
     }
 
-    public static MigrationScript getMigrationScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content, Long version, String author, String rollback, String verify) {
-        return new MigrationScript(databaseName, schemaName, objectName, objectType, content, version, author, rollback, verify);
+    public static MigrationScript getMigrationScript(Script parentScript, String content, Long version, String author, String rollback, String verify) {
+        return new MigrationScript(parentScript, content, version, author, rollback, verify);
     }
 
-    public static MigrationScript getMigrationScript(String fullObjectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
+    public static MigrationScript getSchemaMigrationScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, String content, Long version, String author, String rollback, String verify) {
+        SchemaScript schemaScript = getSchemaScript(databaseName, schemaName, objectType, objectName, content);
+        return new MigrationScript(schemaScript, content, version, author, rollback, verify);
+    }
+
+    public static MigrationScript getSchemaMigrationScript(String fullObjectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
         String databaseName = null, schemaName = null, objectName = null;
         String[] nameSplit = fullObjectName.split("\\.");
         if(nameSplit.length > 2) {
@@ -33,24 +42,31 @@ public static MigrationScript getMigrationScript(String fullObjectName, ScriptOb
             log.error("Error while splitting fullObjectName {}: Missing some values", fullObjectName);
             throw new RuntimeException("Error while splitting fullObjectName");
         }
-        return new MigrationScript(databaseName, schemaName, objectName, objectType, content, version, author, rollback, verify);
+        return getSchemaMigrationScript(databaseName, schemaName, objectType, objectName, content, version, author, rollback, verify);
+
     }
-    public static MigrationScript getMigrationScript(String database, String schema, ScriptObjectType type, String objectName, String content) {
-        Long version = 0L;
-        String author = "DlSync";
-        String rollback = String.format("DROP %s IF EXISTS %s;", type.getSingular(), database + "." + schema + "." + objectName);
-        String verify = String.format("SHOW %s LIKE '%s';",type, database + "." + schema + "." + objectName);
 
-        String migrationHeader = String.format("---version: %s, author: %s\n", version, author);
-        String rollbackFormat = String.format("\n---rollback: %s", rollback);
-        String verifyFormat = String.format("\n---verify: %s", verify);
-        content = migrationHeader + content + rollbackFormat + verifyFormat;
-        MigrationScript script = getMigrationScript(database, schema, type, objectName, content, version, author, rollback, verify);
-        return script;
+
+
+    public static MigrationScript getMigrationScript(Script parentScript, Migration migration) {
+        return new MigrationScript(parentScript, migration.getContent(), migration.getVersion(), migration.getAuthor(), migration.getRollback(), migration.getVerify());
     }
 
-    public static MigrationScript getMigrationScript(String databaseName, String schemaName, ScriptObjectType objectType, String objectName, Migration migration) {
-        return new MigrationScript(databaseName, schemaName, objectName, objectType, migration.getContent(), migration.getVersion(), migration.getAuthor(), migration.getRollback(), migration.getVerify());
+    public static List<MigrationScript> getMigrationScripts(Script parentScript, List<Migration> migrations) {
+        if(!parentScript.getObjectType().isMigration()) {
+            log.error("Script {} is not a migration script.", parentScript);
+            return null;
+        }
+        List<MigrationScript> migrationScripts = new ArrayList<>();
+        for(Migration migration: migrations) {
+            MigrationScript script = ScriptFactory.getMigrationScript(parentScript, migration);
+            if(migrationScripts.contains(script)) {
+                log.error("Duplicate version {} for script {} found.", script.getVersion(), script);
+                throw new RuntimeException("Duplicate version number is not allowed in the same script file.");
+            }
+            migrationScripts.add(script);
+        }
+        return migrationScripts;
     }
 
     public static TestScript getTestScript(String scriptPath, String objectName, String content, Script mainScript) {
@@ -60,5 +76,4 @@ public static TestScript getTestScript(String scriptPath, String objectName, Str
         }
         return null;
     }
-
 }
diff --git a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
index 6f43c92..2ca2a07 100644
--- a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
+++ b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
@@ -53,6 +53,9 @@ public Set<Script> extractScriptDependencies(Script script) {
     }
 
     private boolean isDependencyOf(Script dependency, Script target) {
+        if(target.getObjectName().equals("USER_ROLE") && dependency.getObjectName().equals("{EXAMPLE_DB}.${MAIN_SCHEMA}")) {
+            log.debug("User-role dependency found: {}", dependency);
+        }
         if(dependency.getObjectName().equals(target.getObjectName())) {
             log.debug("Found same object name with different schema: {}, {}", dependency, target);
         }
@@ -61,7 +64,7 @@ private boolean isDependencyOf(Script dependency, Script target) {
             return false;
         }
         for(String identifier: fullIdentifiers) {
-            String fullObjectName = target.getFullObjectNameOfIdentifier(identifier);
+            String fullObjectName = target.resolveObjectReference(identifier);
             if (fullObjectName.equals(dependency.getFullObjectName())) {
                 return true;
             }
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
index 04a7470..7b69c82 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
@@ -229,13 +229,6 @@ public void createScriptObject(Script script, boolean onlyHashes) throws SQLExce
         }
 
     }
-    public List<SchemaScript> getScriptsInSchema(String schema) throws SQLException {
-        List<SchemaScript> scripts = new ArrayList<>();
-        for(ScriptObjectType type: ScriptObjectType.values()) {
-            scripts.addAll(getScriptsInSchema(schema, type));
-        }
-        return scripts;
-    }
 
     public List<SchemaScript> getAllScriptsInSchema(String schema) throws SQLException {
         log.info("Getting all scripts in schema: {}", schema);
@@ -251,77 +244,6 @@ public List<SchemaScript> getAllScriptsInSchema(String schema) throws SQLExcepti
         }
     }
 
-    public List<SchemaScript> getDeclarativeScriptsInSchema(String schema) throws SQLException {
-        List<SchemaScript> scripts = new ArrayList<>();
-        for(ScriptObjectType type: ScriptObjectType.values()) {
-            if(!type.isMigration()) {
-                scripts.addAll(getScriptsInSchema(schema, type));
-            }
-        }
-        return scripts;
-    }
-
-    public List<SchemaScript> getScriptsInSchema(String schema, ScriptObjectType type) throws SQLException {
-        log.debug("Getting {} type scripts in schema: {}",type, schema);
-        String sql = "";
-        if(type == ScriptObjectType.FUNCTIONS || type == ScriptObjectType.PROCEDURES) {
-            sql = String.format("SELECT %s_NAME, ARGUMENT_SIGNATURE FROM INFORMATION_SCHEMA.%s WHERE %s_SCHEMA = '%s'",type.getEscapedSingular(), type, type.getEscapedSingular(), schema.toUpperCase());
-
-        }
-        else if(type == ScriptObjectType.STREAMS || type == ScriptObjectType.TASKS || type == ScriptObjectType.STAGES) {
-            return new ArrayList<>();
-        }
-        else if(type == ScriptObjectType.VIEWS) {
-            sql = String.format("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = '%s'", schema.toUpperCase());
-        }
-        else if(type == ScriptObjectType.TABLES) {
-            sql = String.format("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE <> 'VIEW' AND TABLE_SCHEMA = '%s'", schema.toUpperCase());
-        }
-        else {
-            sql = String.format("SELECT %s_NAME FROM INFORMATION_SCHEMA.%s WHERE %s_SCHEMA = '%s'",type.getEscapedSingular(), type, type.getEscapedSingular(), schema.toUpperCase());
-        }
-
-        log.debug("Getting all scripts using SQL: {}", sql);
-        List<SchemaScript> scripts = new ArrayList<>();
-        ResultSet resultSet = connection.createStatement().executeQuery(sql);
-        while (resultSet.next()) {
-            String ddlSql = "";
-            String scriptObjectName = resultSet.getString(1);
-            if(type == ScriptObjectType.FUNCTIONS || type == ScriptObjectType.PROCEDURES) {
-                String arguments = resultSet.getString(2);
-                String regex = "(\\(|\\,\\s)\\w+";
-                arguments = arguments.replaceAll(regex, "$1");
-                ddlSql = String.format("SELECT GET_DDL('%s', '%s.%s%s', true);",type.getEscapedSingular(), schema.toUpperCase(), scriptObjectName.toUpperCase(), arguments);
-            }
-            else {
-                ddlSql = String.format("SELECT GET_DDL('%s', '%s.%s', true);",type.getEscapedSingular(), schema.toUpperCase(), scriptObjectName.toUpperCase());
-            }
-            log.debug("Get ddl script: {}", ddlSql);
-            ResultSet ddlResultSet = connection.createStatement().executeQuery(ddlSql);
-            ddlResultSet.next();
-            String content = ddlResultSet.getString(1);
-            if (content == null) {
-                log.warn("Unable to read Script definition for {}", scriptObjectName);
-                continue;
-            }
-            if(type.isMigration()) {
-//                String migrationHeader = "---version: 0, author: DlSync\n";
-//                String rollback = String.format("\n---rollback: DROP %s IF EXISTS %s;", type.getSingular(), getDatabaseName() + "." + schema + "." + scriptObjectName);
-//                String verify = String.format("\n---verify: SHOW %s LIKE %s;",type, getDatabaseName() + "." + schema + "." + scriptObjectName);
-//                content = migrationHeader + content + rollback + verify;
-//                Script script = ScriptFactory.getScript(getDatabaseName(), schema, type, scriptObjectName, content, 0L, null, null, null);
-                MigrationScript script = ScriptFactory.getMigrationScript(getDatabaseName(), schema, type, scriptObjectName, content);
-                scripts.add(script);
-            }
-            else {
-                SchemaScript script = ScriptFactory.getDeclarativeScript(getDatabaseName(), schema, type, scriptObjectName, content);
-                scripts.add(script);
-            }
-
-        }
-        return scripts;
-    }
-
 
     public SchemaScript addConfig(SchemaScript script) throws SQLException {
         if(script.getObjectType() == ScriptObjectType.TABLES) {
@@ -365,44 +287,6 @@ public SchemaScript addConfig(SchemaScript script) throws SQLException {
         return script;
     }
 
-//    public List<Script> getScriptsInSchemaWithArguments(String schema, ScriptObjectType type) throws SQLException {
-//        String sql = String.format("SELECT %s_NAME, ARGUMENT_SIGNATURE FROM INFORMATION_SCHEMA.%s WHERE %s_SCHEMA = '%s'",type.getSingular(), type, type.getSingular(), schema.toUpperCase());
-//        log.debug("Getting all scripts using SQL: {}", sql);
-//        List<Script> scripts = new ArrayList<>();
-//        ResultSet resultSet = connection.createStatement().executeQuery(sql);
-//        while (resultSet.next()) {
-//            String scriptObjectName = resultSet.getString(1);
-//            String arguments = resultSet.getString(2);
-//            String regex = "(\\(|\\,\\s)\\w+";
-//            arguments = arguments.replaceAll(regex, "$1");
-//            String ddlSql = String.format("SELECT GET_DDL('%s', '%s.%s%s', true);",type.getSingular(), schema.toUpperCase(), scriptObjectName.toUpperCase(), arguments);
-//            log.info("Get ddl script: {}", ddlSql);
-//            ResultSet ddlResultSet = connection.createStatement().executeQuery(ddlSql);
-//            ddlResultSet.next();
-//            String content = ddlResultSet.getString(1);
-//            if (content == null) {
-//                log.warn("Unable to read Script definition for {}", scriptObjectName);
-//                continue;
-//            }
-//            Script script = new Script(getDatabaseName(), schema, type, scriptObjectName, content);
-//            scripts.add(script);
-//        }
-//        return scripts;
-//    }
-
-    public List<SchemaScript> getAllScriptsInDatabase() throws SQLException {
-        log.info("Getting all scripts for database: {}", getDatabaseName());
-        List<String> schemas = getAllSchemasInDatabase(getDatabaseName());
-        List<SchemaScript> scripts = new ArrayList<>();
-        for(String schema: schemas) {
-//            for(ScriptObjectType scriptObjectType: ScriptObjectType.values()) {
-//                scripts.addAll(getScriptsInSchema(schema, scriptObjectType));
-//            }
-            scripts.addAll(getScriptsInSchema(schema, ScriptObjectType.VIEWS));
-        }
-        return scripts;
-    }
-
     public List<String> getAllSchemasInDatabase(String database) throws SQLException {
         log.info("Reading all schemas in database: {}", database);
         String query = String.format("SELECT * FROM %s.INFORMATION_SCHEMA.SCHEMATA", database);
@@ -465,7 +349,7 @@ public void insertSortedScript(List<Script> sequencedScript) throws SQLException
         connection.createStatement().executeUpdate(insertSql.toString());
     }
 
-    public List<MigrationScript> getMigrationScripts(Set<String> ids) throws SQLException {
+    public List<MigrationScript> getDeployedMigrationScripts(Set<String> ids) throws SQLException {
         if(ids.size() == 0) {
             return new ArrayList<>();
         }
@@ -490,7 +374,7 @@ public List<MigrationScript> getMigrationScripts(Set<String> ids) throws SQLExce
 
             String rollback = rs.getString("ROLLBACK_SCRIPT");
 
-            MigrationScript migrationScript = ScriptFactory.getMigrationScript(fullObjectName, objectType, "", version, null, rollback, null);
+            MigrationScript migrationScript = ScriptFactory.getSchemaMigrationScript(fullObjectName, objectType, "", version, null, rollback, null);
             migrations.add(migrationScript);
         }
         return migrations;
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java b/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
index 9e361a0..76a326c 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptSource.java
@@ -11,9 +11,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -21,6 +19,7 @@ public class ScriptSource {
     private String scriptRoot;
     private String mainScriptDir;
     private String testScriptDir;
+    private final String accountDir = "ACCOUNT";
 
     public ScriptSource(String scriptRoot) {
         this.scriptRoot = scriptRoot;
@@ -35,7 +34,7 @@ private List<String> readDatabase() {
         if(scriptFiles.exists()) {
             File[] allDbs = scriptFiles.listFiles();
             for(File file: allDbs) {
-                if(file.isDirectory()) {
+                if(file.isDirectory() && !file.getName().equalsIgnoreCase(accountDir)) {
                     dbs.add(file.getName());
                 }
             }
@@ -63,27 +62,55 @@ private List<String> readSchemas(String database) {
     }
 
     public List<Script> getAllScripts() throws IOException {
+        return getAllFileScripts()
+                .stream()
+                .flatMap(script -> {
+                    if (script.isMigration() && script.getMigrations() != null) {
+                        return script.getMigrations().stream();
+                    } else {
+                        return List.of(script).stream();
+                    }
+                }).collect(Collectors.toList());
+    }
+
+    public List<Script> getAllFileScripts() throws IOException {
         List<Script> allScripts = new ArrayList<>();
+        List<AccountScript> accountScripts = getScriptsInAccount();
         for(String database: readDatabase()) {
             for(String schema: readSchemas(database)) {
                 allScripts.addAll(getScriptsInSchema(database, schema));
             }
         }
+        allScripts.addAll(accountScripts);
         return allScripts;
     }
 
-    public List<TestScript> getTestScripts(List<Script> scripts) throws IOException {
-            List<TestScript> testScripts = scripts.stream()
-                    .map(script -> {
-                        try {
-                            return getTestScript(script);
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
-                    })
-                    .filter(testScript -> testScript != null)
-                    .collect(Collectors.toList());
-            return testScripts;
+    public List<AccountScript> getScriptsInAccount() throws IOException {
+        List<AccountScript> allScripts = new ArrayList<>();
+        log.info("Reading all Account objects from {}", accountDir);
+        File accountFile = Path.of(mainScriptDir, accountDir).toFile();
+        if(!accountFile.exists()) {
+            return allScripts;
+        }
+        File[] scriptTypeDirectories = accountFile.listFiles();
+        for(File scriptType: scriptTypeDirectories) {
+            if(scriptType.isDirectory() ) {
+                File[] scriptFiles = scriptType.listFiles();
+                for(File file: scriptFiles) {
+                    if(file.getName().toLowerCase().endsWith(".sql")){
+                        AccountScript scriptFromFile = SqlTokenizer.parseAccountScript(file.getPath(), file.getName(), scriptType.getName(), Files.readString(file.toPath()));
+                        allScripts.add(scriptFromFile);
+                    }
+                    else {
+                        log.warn("Script Skipped, File not SQL: {} ", file.getName());
+                    }
+                }
+            }
+            else {
+                log.warn("Script file found outside object type directory: {} ", scriptType.getName());
+            }
+        }
+        return allScripts;
     }
 
     public List<SchemaScript> getScriptsInSchema(String database, String schema) throws IOException {
@@ -97,8 +124,8 @@ public List<SchemaScript> getScriptsInSchema(String database, String schema) thr
                 File[] scriptFiles = scriptType.listFiles();
                 for(File file: scriptFiles) {
                     if(file.getName().toLowerCase().endsWith(".sql")){
-                       Set<SchemaScript> scriptsFromFile = SqlTokenizer.parseSchemaScript(file.getPath(), file.getName(), scriptType.getName(), Files.readString(file.toPath()));
-                       scripts.addAll(scriptsFromFile);
+                       SchemaScript scriptFromFile = SqlTokenizer.parseSchemaScript(file.getPath(), file.getName(), scriptType.getName(), Files.readString(file.toPath()));
+                       scripts.add(scriptFromFile);
                     }
                     else {
                         log.warn("Script Skipped, File not SQL: {} ", file.getName());
@@ -112,43 +139,20 @@ public List<SchemaScript> getScriptsInSchema(String database, String schema) thr
         return scripts;
     }
 
-    public Set<SchemaScript> buildScriptFromFile(File file, File scriptType) throws IOException {
-        String content = Files.readString(file.toPath());
-        String objectName = SqlTokenizer.extractObjectName(file.getName(), content);
-        ScriptObjectType objectType = ScriptObjectType.valueOf(scriptType.getName());
-        String fullIdentifier = SqlTokenizer.getFirstFullIdentifier(objectName, content);
-        if(fullIdentifier == null || fullIdentifier.isEmpty()) {
-            log.error("Error reading script: {}, name and content mismatch", file.getName());
-            throw new RuntimeException("Object name and file name must match!");
-        }
-        String database = SqlTokenizer.extractDatabaseName(fullIdentifier);
-        String schema = SqlTokenizer.extractSchemaName(fullIdentifier);
-        if(database == null || schema == null) {
-            log.error("Error reading script: {}, database or schema not specified", file.getName());
-            throw new RuntimeException("Database, schema and object name must be provided in the script file.");
-        }
-        Set<SchemaScript> scripts = new HashSet<>();
-        if(objectType.isMigration()) {
-            List<Migration> migrations = SqlTokenizer.parseMigrationScripts(content);
-            for(Migration migration: migrations) {
-                MigrationScript script = ScriptFactory.getMigrationScript(database, schema, objectType, objectName, migration);
-//                Script script = new Script(database, schema, objectType, objectName, migration.getContent(), migration.getVersion(), migration.getAuthor(), migration.getRollback());
-                if(scripts.contains(script)) {
-                    log.error("Duplicate version {} for script {} found.", script.getVersion(), script);
-                    throw new RuntimeException("Duplicate version number is not allowed in the same script file.");
-                }
-                scripts.add(script);
-            }
-        }
-        else {
-            SchemaScript script = ScriptFactory.getDeclarativeScript(file.getPath(), database, schema, objectType, objectName, content);
-//            Script script = new Script(database, schema, objectType, objectName, content);
-            scripts.add(script);
-        }
-        return scripts;
+    public List<TestScript> getTestScripts(List<Script> scripts) throws IOException {
+        List<TestScript> testScripts = scripts.stream()
+                .map(script -> {
+                    try {
+                        return getTestScript(script);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .filter(testScript -> testScript != null)
+                .collect(Collectors.toList());
+        return testScripts;
     }
 
-
     public TestScript getTestScript(Script script) throws IOException {
         String objectName = script.getObjectName() + "_TEST";
         String testScriptPath = script.getScriptPath().replace(".SQL", "_TEST.SQL");
@@ -187,6 +191,29 @@ public void createSchemaScriptFile(SchemaScript script) {
         }
     }
 
+    public void createAccountScriptFiles(List<AccountScript> scripts) {
+        log.debug("Creating script files for the account scripts: {}", scripts);
+        for(AccountScript script: scripts) {
+            createAccountScriptFile(script);
+        }
+    }
+
+    public void createAccountScriptFile(AccountScript script) {
+        try {
+            String scriptFileName = script.getObjectName() + ".SQL";
+            String scriptDirectoryPath = String.format("%s/%s/%s", mainScriptDir, accountDir, script.getObjectType());
+            File directory = new File(scriptDirectoryPath);
+            directory.mkdirs();
+            FileWriter fileWriter = new FileWriter(Path.of(scriptDirectoryPath,  scriptFileName).toFile());
+            fileWriter.write(script.getContent());
+            fileWriter.close();
+            log.debug("File {} created successfully", Path.of(scriptDirectoryPath,  scriptFileName));
+        } catch (IOException e) {
+            log.error("Error in creating account script: {}", e.getMessage());
+            throw new RuntimeException(e);
+        }
+    }
+
     private Script getScriptByName(List<Script> allScripts, String fullObjectName) {
         return allScripts.parallelStream().filter(script -> script.getFullObjectName().equals(fullObjectName)).findFirst().get();
     }
diff --git a/src/main/java/com/snowflake/dlsync/models/MigrationScript.java b/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
index 8e4b2f0..3f6ea8d 100644
--- a/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
+++ b/src/main/java/com/snowflake/dlsync/models/MigrationScript.java
@@ -1,28 +1,40 @@
 package com.snowflake.dlsync.models;
 
-public class MigrationScript extends SchemaScript {
+public class MigrationScript extends Script {
 
+    private Script parentScript;
     private Long version;
     private String author;
     private String rollback;
     private String verify;
 
-    public MigrationScript(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
-        super(scriptPath, databaseName, schemaName, objectName, objectType, content);
+    public MigrationScript(Script parentScript, String content, Long version, String author, String rollback, String verify) {
+        super(parentScript.getScriptPath(), parentScript.getObjectName(), parentScript.getObjectType(), content);
+        this.parentScript = parentScript;
         this.version = version;
         this.author = author;
         this.rollback = rollback;
         this.verify = verify;
     }
 
-    public MigrationScript(String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
-        this(null, databaseName, schemaName, objectName, objectType, content, version, author, rollback, verify);
+
+    @Override
+    public String getId() {
+        return String.format("%s:%s", parentScript.getFullObjectName(), version);
     }
 
+    @Override
+    public String getFullObjectName() {
+        return parentScript.getFullObjectName();
+    }
 
     @Override
-    public String getId() {
-        return String.format("%s:%s", getFullObjectName(), version);
+    public String resolveObjectReference(String partialName) {
+        return parentScript.resolveObjectReference(partialName);
+    }
+
+    public Script getParentScript() {
+        return parentScript;
     }
 
     public Long getVersion() {
@@ -56,4 +68,5 @@ public String getVerify() {
     public void setVerify(String verify) {
         this.verify = verify;
     }
+
 }
diff --git a/src/main/java/com/snowflake/dlsync/models/Script.java b/src/main/java/com/snowflake/dlsync/models/Script.java
index 7f18c80..726bb1c 100644
--- a/src/main/java/com/snowflake/dlsync/models/Script.java
+++ b/src/main/java/com/snowflake/dlsync/models/Script.java
@@ -2,6 +2,7 @@
 
 import com.snowflake.dlsync.Util;
 
+import java.util.List;
 import java.util.Objects;
 
 public abstract class Script {
@@ -10,6 +11,7 @@ public abstract class Script {
     private ScriptObjectType objectType;
     private String content;
     private String hash;
+    private List<MigrationScript> migrations;
 
     public Script(String scriptPath, String objectName, ScriptObjectType objectType, String content) {
         this.scriptPath = scriptPath;
@@ -19,6 +21,11 @@ public Script(String scriptPath, String objectName, ScriptObjectType objectType,
         this.hash = hash = Util.getMd5Hash(this.content);
     }
 
+    public Script(String scriptPath, String objectName, ScriptObjectType objectType, String content, List<MigrationScript> migrations) {
+        this(scriptPath, objectName, objectType, content);
+        this.migrations = migrations;
+    }
+
     public String getScriptPath() {
         return scriptPath;
     }
@@ -47,6 +54,22 @@ public void setContent(String content) {
         this.content = content.trim();
     }
 
+    public List<MigrationScript> getMigrations() {
+        if (isMigration()) {
+            return migrations;
+        }
+        throw new UnsupportedOperationException("Migrations are only available for migration type script.");
+    }
+
+    public  void setMigrations(List<MigrationScript> migrations) {
+        if (isMigration()) {
+            this.migrations = migrations;
+        }
+        else {
+            throw new UnsupportedOperationException("Migrations are only available for migration type script.");
+        }
+    }
+
     public String getHash() {
         return hash;
     }
@@ -55,6 +78,10 @@ public void setHash(String hash) {
         this.hash = hash;
     }
 
+    public boolean isMigration() {
+        return objectType.isMigration();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -77,5 +104,5 @@ public String toString() {
 
     public abstract String getFullObjectName();
 
-    public abstract String getFullObjectNameOfIdentifier(String partialName);
+    public abstract String resolveObjectReference(String partialName);
 }
diff --git a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
index 45b939a..1e48299 100644
--- a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
+++ b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
@@ -1,11 +1,41 @@
 package com.snowflake.dlsync.models;
 
 public enum ScriptObjectType {
-    VIEWS("VIEW"),FUNCTIONS("FUNCTION"),PROCEDURES("PROCEDURE"),FILE_FORMATS("FILE FORMAT"),TABLES("TABLE"),STREAMS("STREAM"),SEQUENCES("SEQUENCE"),STAGES("STAGE"),TASKS("TASK"),STREAMLITS("STREAMLIT"),PIPES("PIPE"),ALERTS("ALERT"),DYNAMIC_TABLES("DYNAMIC TABLE"),MASKING_POLICIES("MASKING POLICY");
+    VIEWS("VIEW", false),
+    FUNCTIONS("FUNCTION", false),
+    PROCEDURES("PROCEDURE", false),
+    FILE_FORMATS("FILE FORMAT", false),
+    STREAMLITS("STREAMLIT", false),
+    PIPES("PIPE", false),
+    MASKING_POLICIES("MASKING POLICY", false),
+    RESOURCE_MONITORS("RESOURCE MONITOR", false),
+    NETWORK_POLICIES("NETWORK POLICY", false),
+    SESSION_POLICIES("SESSION POLICY", false),
+    PASSWORD_POLICIES("PASSWORD POLICY", false),
+    AUTHENTICATION_POLICIES("AUTHENTICATION POLICY", false),
+    API_INTEGRATIONS("API INTEGRATION", false),
+    NOTIFICATION_INTEGRATIONS("NOTIFICATION INTEGRATION", false),
+    SECURITY_INTEGRATIONS("SECURITY INTEGRATION", false),
+    STORAGE_INTEGRATIONS("STORAGE INTEGRATION", false),
+    WAREHOUSES("WAREHOUSE", false),
+
+    TABLES("TABLE", true),
+    STREAMS("STREAM", true),
+    SEQUENCES("SEQUENCE", true),
+    STAGES("STAGE", true),
+    TASKS("TASK", true),
+    ALERTS("ALERT", true),
+    DYNAMIC_TABLES("DYNAMIC TABLE", true),
+    DATABASES("DATABASE", true),
+    SCHEMAS("SCHEMA", true),
+    ROLES("ROLE", true);
 
     private final String singular;
-    private ScriptObjectType(String type) {
+    private final boolean isMigration;
+    private ScriptObjectType(String type, boolean isMigration) {
         this.singular = type;
+        this.isMigration = isMigration;
+
     }
     public String getSingular() {
         return singular;
@@ -14,17 +44,6 @@ public String getEscapedSingular() {
         return singular.replace(" ", "_");
     }
     public boolean isMigration() {
-        switch (this) {
-            case TABLES:
-            case STREAMS:
-            case SEQUENCES:
-            case STAGES:
-            case TASKS:
-            case ALERTS:
-            case DYNAMIC_TABLES:
-                return true;
-            default:
-                return false;
-        }
+        return isMigration;
     }
 }
diff --git a/src/main/java/com/snowflake/dlsync/models/TestScript.java b/src/main/java/com/snowflake/dlsync/models/TestScript.java
index ac629f1..5951cac 100644
--- a/src/main/java/com/snowflake/dlsync/models/TestScript.java
+++ b/src/main/java/com/snowflake/dlsync/models/TestScript.java
@@ -33,7 +33,7 @@ public String getFullObjectName() {
     }
 
     @Override
-    public String getFullObjectNameOfIdentifier(String partialName) {
-        return mainScript.getFullObjectNameOfIdentifier(partialName);
+    public String resolveObjectReference(String partialName) {
+        return mainScript.resolveObjectReference(partialName);
     }
 }
diff --git a/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java b/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
index 49ce402..a6a7748 100644
--- a/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
+++ b/src/main/java/com/snowflake/dlsync/parser/SqlTokenizer.java
@@ -22,7 +22,7 @@ public class SqlTokenizer {
     private static final String IDENTIFIER_REGEX = "((?:\\\"[^\"]+\\\"\\.)|(?:[{}$a-zA-Z0-9_]+\\.))?((?:\\\"[^\"]+\\\"\\.)|(?:[{}$a-zA-Z0-9_]+\\.))?(?i)";
     private static final String MIGRATION_REGEX = VERSION_REGEX + AUTHOR_REGEX + CONTENT_REGEX + ROLL_BACK_REGEX + VERIFY_REGEX;
 
-    private static final String DDL_REGEX = ";\\n+(CREATE\\s+OR\\s+REPLACE\\s+(TRANSIENT\\s|HYBRID\\s|SECURE\\s)?(?<type>DYNAMIC TABLE|FILE FORMAT|MASKING POLICY|VIEW|FUNCTION|PROCEDURE|TABLE|STREAM|SEQUENCE|STAGE|TASK|STREAMLIT|PIPE|ALERT|\\w+)\\s+(?<name>[\\\"\\w.]+)([\\s\\S]+?)(?=(;\\nCREATE\\s+)|(;$)))";
+    private static final String DDL_REGEX = buildDdlRegex();
 
     private static final String STRING_LITERAL_REGEX = "(?<!as\\s{1,5})'([^'\\\\]*(?:\\\\.[^'\\\\]*)*(?:''[^'\\\\]*)*)'";
 
@@ -31,6 +31,25 @@ public class SqlTokenizer {
     private static final String PROCEDURE_BODY_REGEX = "(CREATE\\s+OR\\s+REPLACE\\s+PROCEDURE\\s+)(?<name>[\\w.${}]+)(?:[\\s\\S]*?AS\\s+('|\\$\\$)\\s*)(?<body>[\\s\\S]+)('|\\$\\$)\\s*;$";
     private static final String FILE_FORMAT_BODY_REGEX = "(CREATE\\s+OR\\s+REPLACE\\s+FILE FORMAT\\s+)(?<body>[\\w.${}]+)([\\s\\S]+)$";
 
+    /**
+     * Dynamically builds DDL_REGEX pattern from ScriptObjectType enum values
+     * This ensures that all supported object types are included in the regex
+     */
+    private static String buildDdlRegex() {
+        StringBuilder objectTypes = new StringBuilder();
+        ScriptObjectType[] types = ScriptObjectType.values();
+
+        for (int i = 0; i < types.length; i++) {
+            if (i > 0) {
+                objectTypes.append("|");
+            }
+            // Escape spaces in object type names like "DYNAMIC TABLE" and "FILE FORMAT"
+            objectTypes.append(types[i].getSingular().replace(" ", "\\s+"));
+        }
+
+        return ";\\n+(CREATE\\s+OR\\s+REPLACE\\s+(TRANSIENT\\s|HYBRID\\s|SECURE\\s)?(?<type>" + objectTypes.toString() + "|\\w+)\\s+(IF\\s+NOT\\s+EXISTS\\s+)?(?<name>[\\\"\\w.]+)([\\s\\S]+?)(?=(;\\nCREATE\\s+)|(;$)))";
+    }
+
     public static List<Migration> parseMigrationScripts(String content) {
         List<Migration> migrations = new ArrayList<>();
 
@@ -55,7 +74,27 @@ public static List<Migration> parseMigrationScripts(String content) {
         return migrations;
     }
 
-    public static Set<SchemaScript> parseSchemaScript(String filePath, String name, String scriptType, String content) {
+    public static AccountScript parseAccountScript(String filePath, String name, String scriptType, String content) {
+        String objectName = extractObjectName(name, content);
+        Optional<ScriptObjectType> optionalObjectType = Arrays.stream(ScriptObjectType.values()).filter( type -> type.toString().equalsIgnoreCase(scriptType)).findFirst();
+        if(!optionalObjectType.isPresent()) {
+            log.error("Unsupported object type: {} found!", scriptType, name);
+            throw new RuntimeException("Unknown script type of directory: " + scriptType);
+        }
+        ScriptObjectType objectType = optionalObjectType.get();
+        AccountScript accountScript = ScriptFactory.getAccountScript(filePath, objectType, objectName, content);
+        if(objectType.isMigration()) {
+            List<Migration> migrations = SqlTokenizer.parseMigrationScripts(content);
+            if(migrations.isEmpty()) {
+                log.warn("Object type: {} is migration, but there are no migrations found in the file: {}", objectType, filePath);
+            }
+            List<MigrationScript> migrationScripts = ScriptFactory.getMigrationScripts(accountScript, migrations);
+            accountScript.setMigrations(migrationScripts);
+        }
+        return accountScript;
+    }
+
+    public static SchemaScript parseSchemaScript(String filePath, String name, String scriptType, String content) {
         String objectName = SqlTokenizer.extractObjectName(name, content);
         Optional<ScriptObjectType> optionalObjectType = Arrays.stream(ScriptObjectType.values()).filter( type -> type.toString().equalsIgnoreCase(scriptType)).findFirst();
         if(!optionalObjectType.isPresent()) {
@@ -74,28 +113,16 @@ public static Set<SchemaScript> parseSchemaScript(String filePath, String name,
             log.error("Error reading script: {}, database or schema not specified", name);
             throw new RuntimeException("Database, schema and object name must be provided in the script file.");
         }
-        Set<SchemaScript> scripts = new HashSet<>();
+        SchemaScript schemaScript = ScriptFactory.getSchemaScript(filePath, database, schema, objectType, objectName, content);
         if(objectType.isMigration()) {
             List<Migration> migrations = SqlTokenizer.parseMigrationScripts(content);
             if(migrations.isEmpty()) {
                 log.warn("Object type: {} is migration, but there are no migrations found in the file: {}", objectType, filePath);
             }
-            for(Migration migration: migrations) {
-                MigrationScript script = ScriptFactory.getMigrationScript(database, schema, objectType, objectName, migration);
-//                Script script = new Script(database, schema, objectType, objectName, migration.getContent(), migration.getVersion(), migration.getAuthor(), migration.getRollback());
-                if(scripts.contains(script)) {
-                    log.error("Duplicate version {} for script {} found.", script.getVersion(), script);
-                    throw new RuntimeException("Duplicate version number is not allowed in the same script file.");
-                }
-                scripts.add(script);
-            }
-        }
-        else {
-            SchemaScript script = ScriptFactory.getDeclarativeScript(filePath, database, schema, objectType, objectName, content);
-//            Script script = new Script(database, schema, objectType, objectName, content);
-            scripts.add(script);
+            List<MigrationScript> migrationScripts = ScriptFactory.getMigrationScripts(schemaScript, migrations);
+            schemaScript.setMigrations(migrationScripts);
         }
-        return scripts;
+        return schemaScript;
     }
 
     public static String removeSqlComments(String sql) {
@@ -258,10 +285,19 @@ public static List<SchemaScript> parseDdlScripts(String ddl, String database, St
             String scriptObjectName  = fullObjectName.split("\\.")[2];
 
             if (objectType.isMigration()) {
-                MigrationScript script = ScriptFactory.getMigrationScript(database, schema, objectType, scriptObjectName, content);
+                Long version = 0L;
+                String author = "DlSync";
+                String rollback = String.format("DROP %s IF EXISTS %s;", objectType.getSingular(), fullObjectName);
+                String verify = String.format("SHOW %s LIKE '%s';", objectType, fullObjectName);
+
+                String migrationHeader = String.format("---version: %s, author: %s\n", version, author);
+                String rollbackFormat = String.format("\n---rollback: %s", rollback);
+                String verifyFormat = String.format("\n---verify: %s", verify);
+                content = migrationHeader + content + rollbackFormat + verifyFormat;
+                SchemaScript script = ScriptFactory.getSchemaScript(database, schema, objectType, scriptObjectName, content);
                 scripts.add(script);
             } else {
-                SchemaScript script = ScriptFactory.getDeclarativeScript(database, schema, objectType, scriptObjectName, content);
+                SchemaScript script = ScriptFactory.getSchemaScript(database, schema, objectType, scriptObjectName, content);
                 scripts.add(script);
             }
         }
@@ -356,7 +392,7 @@ else if(script1.getObjectType().equals(ScriptObjectType.FILE_FORMATS)) {
     }
 
     public static String extractObjectName(String fileName, String content) {
-        return fileName.split("\\.")[0].toUpperCase();
+        return fileName.replaceAll("(?i)\\.sql$", "").toUpperCase();
     }
 
     public static String extractDatabaseName(String fullIdentifier) {
@@ -378,4 +414,24 @@ else if(names.length == 2) {
         return null;
     }
 
+    public static String extractObjectNameFromDdl(String ddlContent) {
+        ddlContent = removeSqlComments(ddlContent);
+        ddlContent = removeSqlStringLiterals(ddlContent);
+
+        Matcher matcher = Pattern.compile(DDL_REGEX, Pattern.CASE_INSENSITIVE).matcher(ddlContent);
+        if (matcher.find()) {
+            String fullObjectName = matcher.group("name");
+            if (fullObjectName != null && !fullObjectName.isEmpty()) {
+                // Extract just the object name (last part after final dot)
+                String[] parts = fullObjectName.split("\\.");
+                String objectName = parts[parts.length - 1];
+                // Remove quotes if present
+                objectName = objectName.replace("\"", "");
+                return objectName.toUpperCase();
+            }
+        }
+
+        log.warn("Could not extract object name from DDL content");
+        return null;
+    }
 }
diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
index 09b3a3d..b986dce 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
@@ -1,6 +1,7 @@
 package com.snowflake.dlsync.dependency;
 
 import com.snowflake.dlsync.ScriptFactory;
+import com.snowflake.dlsync.models.MigrationScript;
 import com.snowflake.dlsync.models.SchemaScript;
 import com.snowflake.dlsync.models.Script;
 import com.snowflake.dlsync.models.ScriptObjectType;
@@ -12,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -31,7 +33,7 @@ void tearDown() {
     List<SchemaScript> mockScripts(String name, String schema, String... contents) {
         List<SchemaScript> scripts = new ArrayList<>();
         for(int i = 0; i < contents.length; i++) {
-            SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.VIEWS, name + i, contents[i]);
+            SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.VIEWS, name + i, contents[i]);
             scripts.add(script);
         }
         return scripts;
@@ -52,12 +54,12 @@ List<SchemaScript> mockNotDependency() {
 
     SchemaScript mockViewDependency(String name, String schema) {
         String content = "CREATE OR REPLACE VIEW " + name + " AS SELECT * FROM  TABLE1;";
-        return ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.VIEWS, name, content);
+        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.VIEWS, name, content);
     }
 
-    SchemaScript mockTableDependency(String name, String schema) {
+    MigrationScript mockTableDependency(String name, String schema) {
         String content = "CREATE OR REPLACE TABLE " + name + "(ID VARCHAR, COL1 NUMBER)";
-        return ScriptFactory.getMigrationScript("TEST_DB", schema, ScriptObjectType.TABLES, name, content);
+        return ScriptFactory.getSchemaMigrationScript("TEST_DB", schema, ScriptObjectType.TABLES, name, content, 0L, "dlsync", "", "");
     }
 
     SchemaScript mockUdfDependency(String name, String schema) {
@@ -68,13 +70,13 @@ SchemaScript mockUdfDependency(String name, String schema) {
                 "$$\n" +
                 " return ARG1.toUpperCase();\n" +
                 "$$;";
-        return ScriptFactory.getDeclarativeScript("TEST_DB", schema, ScriptObjectType.FUNCTIONS, name, content);
+        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.FUNCTIONS, name, content);
     }
 
     @Test
     void extractScriptDependenciesTestFrom() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  DEPENDENCY join test_schema2.not_dependency1;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
         List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
@@ -90,7 +92,7 @@ void extractScriptDependenciesTestFrom() {
     @Test
     void extractScriptDependenciesTestJoin() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  DEPENDENCY JOIN test_schema.JOIN_DEPENDENCY;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA");
         SchemaScript dependency2 = mockViewDependency("JOIN_DEPENDENCY", "TEST_SCHEMA");
@@ -111,7 +113,7 @@ void extractScriptDependenciesTestJoin() {
     @Test
     void extractScriptDependenciesTestWithQuotedObjects() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT * FROM  \"TEST_SCHEMA2\".\"DEPENDENCY\" join \"TEST_SCHEMA2\".\"NOT_DEPENDENCY1\"";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY", "TEST_SCHEMA2");
 
@@ -138,7 +140,7 @@ void extractScriptDependenciesTestWithComments() throws IOException {
                 "SELECT * FROM NOT_DEPENDENCY2;\n" +
                 "*/\n" +
                 "DEPENDENCY3 T4 ON T4.ID = T1.ID;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
         SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
@@ -183,7 +185,7 @@ void extractScriptDependenciesTestWithCTE() {
                 "         ), CTE5 AS (SELECT * FROM CTE4 JOIN JOIN_DEPENDENCY3)\n" +
                 "    SELECT  * FROM CTE1 C1 JOIN CTE5 CT5 ON CT1.ID=CT5.ID JOIN JOIN_DEPENDENCY4 ON CT1.ID=CT5.ID;";
 
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
 
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
         SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
@@ -217,7 +219,7 @@ void extractScriptDependenciesTestWithCTE() {
     @Test
     void extractScriptDependenciesTestWithQuoted() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT 'SELECT * FROM NOT_DEPENDENCY1', * FROM  DEPENDENCY1";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
         List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
@@ -234,7 +236,7 @@ void extractScriptDependenciesTestWithQuoted() {
     @Test
     void extractScriptDependenciesTestWithAliases() {
         String content = "CREATE OR REPLACE VIEW VIEW1 AS SELECT  * FROM  DEPENDENCY1 as dp1, DEPENDENCY2 dp2, DEPENDENCY3 AS dp3 where dp1.id=dp2.id and dp2.id=dp3.id;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency1 = mockViewDependency("DEPENDENCY1", "TEST_SCHEMA");
         SchemaScript dependency2 = mockViewDependency("DEPENDENCY2", "TEST_SCHEMA");
         SchemaScript dependency3 = mockViewDependency("DEPENDENCY3", "TEST_SCHEMA");
@@ -257,7 +259,7 @@ void extractScriptDependenciesTestWithAliases() {
     @Test
     void extractScriptDependenciesWithSameObjectName() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT * FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency = mockViewDependency("VIEW1", "TEST_SCHEMA2");
         List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
@@ -273,7 +275,7 @@ void extractScriptDependenciesWithSameObjectName() {
     @Test
     void extractScriptDependenciesWithUdf() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2, TEST_SCHEMA1.UDF1(COL3) AS COL4 FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
         SchemaScript dependency2 = mockUdfDependency("UDF1", "TEST_SCHEMA1");
         List<SchemaScript> changedScript = mockScripts();
@@ -295,7 +297,7 @@ void extractScriptDependenciesTableWithViewDependency() {
         "---version: 0, author: dlsync\n" +
         "CREATE OR REPLACE TABLE TEST_SCHEMA.TABLE1 AS SELECT * FROM TEST_SCHEMA.VIEW1;\n";
 
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content);
         SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA");
         List<SchemaScript> changedScript = mockScripts();
         changedScript.add(script);
@@ -314,15 +316,15 @@ void extractScriptDependenciesWithStringNames() {
                 "---version: 1, author: dlsync\n" +
                 "INSERT INTO TEST_SCHEMA.TABLE1 values(1, 'not_dependency1');\n";
 
-        SchemaScript script = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content, 1L, "dlsync", "", "");
-        SchemaScript dependency1 = mockTableDependency("TABLE1", "TEST_SCHEMA");
+        Script script = ScriptFactory.getSchemaMigrationScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "TABLE1", content, 1L, "dlsync", "", "");
+        MigrationScript dependency1 = mockTableDependency("TABLE1", "TEST_SCHEMA");
         SchemaScript not_dependency1 = mockViewDependency("NOT_DEPENDENCY1", "TEST_SCHEMA");
-        List<SchemaScript> changedScript = mockScripts();
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
         changedScript.add(script);
         changedScript.add(dependency1);
         changedScript.add(not_dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<SchemaScript> expected = Set.of(
+        Set<Script> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
@@ -332,7 +334,7 @@ void extractScriptDependenciesWithStringNames() {
     @Test
     void extractScriptDependenciesIdentifierAfterEquals() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2=FUNC1(COL3) FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
         SchemaScript dependency2 = mockUdfDependency("FUNC1", "TEST_SCHEMA");
         List<SchemaScript> changedScript = mockScripts();
@@ -351,7 +353,7 @@ void extractScriptDependenciesIdentifierAfterEquals() {
     // TODO: Fix this failing test
     void extractScriptDependenciesWithSameName() {
         String content = "CREATE OR REPLACE VIEW TEST_SCHEMA.VIEW1 AS SELECT COL1, COL2 FROM  TEST_SCHEMA2.VIEW1 join test_schema2.not_dependency1;";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content);
         SchemaScript dependency1 = mockViewDependency("VIEW1", "TEST_SCHEMA2");
         SchemaScript notDependency = mockUdfDependency("VIEW1", "TEST_SCHEMA2");
         List<SchemaScript> changedScript = mockScripts();
@@ -372,13 +374,13 @@ void extractScriptDependenciesIdentifierInQuotes() {
                 "root_location=@TEST_SCHEMA2.STAGE1\n" +
                 "\tmain_file='/streamlit_app.py'\n" +
                 "\tquery_warehouse='${MY_WAREHOUSE}'";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA1", ScriptObjectType.STREAMLITS, "STREAMLIT_1", content);
-        SchemaScript dependency1 = ScriptFactory.getMigrationScript("TEST_DB", "TEST_SCHEMA2", ScriptObjectType.STAGES, "STAGE1", "---version: 1, author: dlsync\nCREATE OR REPLACE STAGE TEST_SCHEMA2.STAGE1;", 1L, "dlsync", "", "");
-        List<SchemaScript> changedScript = mockScripts();
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA1", ScriptObjectType.STREAMLITS, "STREAMLIT_1", content);
+        Script dependency1 = ScriptFactory.getSchemaMigrationScript("TEST_DB", "TEST_SCHEMA2", ScriptObjectType.STAGES, "STAGE1", "---version: 1, author: dlsync\nCREATE OR REPLACE STAGE TEST_SCHEMA2.STAGE1;", 1L, "dlsync", "", "");
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());;
         changedScript.add(script);
         changedScript.add(dependency1);
         dependencyExtractor.addScripts(changedScript);
-        Set<SchemaScript> expected = Set.of(
+        Set<Script> expected = Set.of(
                 dependency1
         );
         Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
index cfb59f1..830f894 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyGraphTest.java
@@ -37,10 +37,10 @@ void topologicalSortTest() {
         String content3 = "CREATE OR replace VIEW VIEW3 AS SELECT * FROM VIEW2;";
         String content4 = "create or replace view VIEW4 AS SELECT * FROM VIEW3;";
 
-        SchemaScript script1 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
-        SchemaScript script2 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
-        SchemaScript script3 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
-        SchemaScript script4 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
+        SchemaScript script1 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
+        SchemaScript script2 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
+        SchemaScript script3 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
+        SchemaScript script4 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
 
         dependencyGraph.addNodes(List.of(script1, script2, script3, script4));
         List<Script> expected = List.of(script1, script2, script3, script4);
@@ -61,14 +61,14 @@ void topologicalSortMultipleDependencyTest() {
         String content7 = "CREATE OR REPLACE VIEW VIEW7 AS SELECT * FROM VIEW6 V5 JOIN VIEW1 V1 ON V5.ID=V1.ID;";
         String content8 = "CREATE OR REPLACE VIEW VIEW7 AS SELECT * FROM VIEW1 WHERE ID NOT IN (SELECT ID FROM VIEW7);";
 
-        SchemaScript script1 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
-        SchemaScript script2 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
-        SchemaScript script3 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
-        SchemaScript script4 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
-        SchemaScript script5 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW5", content5);
-        SchemaScript script6 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW6", content6);
-        SchemaScript script7 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW7", content7);
-        SchemaScript script8 = ScriptFactory.getDeclarativeScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW8", content8);
+        SchemaScript script1 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW1", content1);
+        SchemaScript script2 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW2", content2);
+        SchemaScript script3 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW3", content3);
+        SchemaScript script4 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW4", content4);
+        SchemaScript script5 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW5", content5);
+        SchemaScript script6 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW6", content6);
+        SchemaScript script7 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW7", content7);
+        SchemaScript script8 = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "VIEW8", content8);
 
         List<SchemaScript> scripts = new ArrayList<>(List.of(script1, script2, script3, script4, script5, script6, script7, script8));
         Collections.shuffle(scripts);
diff --git a/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java b/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
index 2ac921a..1f2dd18 100644
--- a/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/ParameterInjectorTest.java
@@ -33,7 +33,7 @@ void tearDown() {
     @Test
     void injectParametersDontCapture() {
         String content = "create or replace view as select * from ${db}.${schema1}.table1 where db='my_db'";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.injectParameters(script);
         String actual = script.getContent();
         String expected = "create or replace view as select * from TEST_DB.test_schema_1.table1 where db='my_db'";
@@ -43,7 +43,7 @@ void injectParametersDontCapture() {
     @Test
     void injectParametersTest() {
         String content = "create or replace view as select * from ${db}.${schema1}.table1 tb1 join test_${profile} tp on tp.id=tb1.id where tenant = '${tenant_id}'";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.injectParameters(script);
         String actual = script.getContent();
         String expected = "create or replace view as select * from TEST_DB.test_schema_1.table1 tb1 join test_dev tp on tp.id=tb1.id where tenant = 'test_tenant_id'";
@@ -53,7 +53,7 @@ void injectParametersTest() {
     @Test
     void parametrizeScriptTest() {
         String content = "create or replace view as select * from TEST_DB.test_schema_1.table1 where tenant = 'test_tenant_id'";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("", "", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.parametrizeScript(script, false);
         String actual = script.getContent();
         String expected = "create or replace view as select * from ${db}.${schema1}.table1 where tenant = '${tenant_id}'";
@@ -63,7 +63,7 @@ void parametrizeScriptTest() {
     @Test
     void parameterizeObjectNameTest() {
         String content = "create or replace view as select * from TEST_DB.test_schema_1.table1 where tenant = 'test_tenant_id'";
-        SchemaScript script = ScriptFactory.getDeclarativeScript("TEST_DB", "test_schema_1", ScriptObjectType.VIEWS, "VIEW1", content);
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "test_schema_1", ScriptObjectType.VIEWS, "VIEW1", content);
         parameterInjector.parameterizeObjectName(script);
         String actual = script.getFullObjectName();
         String expected = "${DB}.${SCHEMA1}.VIEW1";
diff --git a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
index 17225da..5af9773 100644
--- a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
@@ -1,10 +1,7 @@
 package com.snowflake.dlsync.parser;
 
 import com.snowflake.dlsync.ScriptFactory;
-import com.snowflake.dlsync.models.Migration;
-import com.snowflake.dlsync.models.MigrationScript;
-import com.snowflake.dlsync.models.SchemaScript;
-import com.snowflake.dlsync.models.ScriptObjectType;
+import com.snowflake.dlsync.models.*;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -211,15 +208,17 @@ void parseDdlScriptsTest() {
                 "return arg1.trim();\n"+
                 "';";
         List<SchemaScript> actual = SqlTokenizer.parseDdlScripts(ddl, "db1", "schema1");
-        List<SchemaScript> expected = List.of(
-                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.VIEWS, "view1","create or replace view db1.schema1.view1 as select * from table1;"),
-                ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table1","create or replace table db1.schema1.table1 (col1 varchar, col2 number);"),
-                ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table2","create or replace transient table db1.schema1.table2 (col1 varchar, col2 number);"),
-                ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "table3","create or replace hybrid table db1.schema1.table3 (col1 varchar, col2 number);"),
-                ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.TABLES, "\"table4\"","create or replace table db1.schema1.\"table4\" (col1 varchar, col2 number);"),
-                ScriptFactory.getMigrationScript("db1", "schema1", ScriptObjectType.DYNAMIC_TABLES, "dynamic_table1","create or replace dynamic table db1.schema1.dynamic_table1 (col1 varchar, col2 number)\n as SELECT id, name, COUNT(*) as count FROM db1.schema1.source_table GROUP BY id, name;"),
-                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.MASKING_POLICIES, "masking_policy1","create or replace masking policy db1.schema1.masking_policy1 as (val string) returns string -> case when current_role() in ('ANALYST_ROLE', 'PUBLIC') then val else '****' end;"),
-                ScriptFactory.getDeclarativeScript("db1", "schema1", ScriptObjectType.FUNCTIONS, "function1","create or replace function db1.schema1.function1(arg1 varchar)\n" +
+        Long version = 0L;
+        String author = "DlSync";
+        List<Script> expected = List.of(
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.VIEWS, "view1","create or replace view db1.schema1.view1 as select * from table1;"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.TABLES, "table1","create or replace table db1.schema1.table1 (col1 varchar, col2 number);"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.TABLES, "table2","create or replace transient table db1.schema1.table2 (col1 varchar, col2 number);"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.TABLES, "table3","create or replace hybrid table db1.schema1.table3 (col1 varchar, col2 number);"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.TABLES, "\"table4\"","create or replace table db1.schema1.\"table4\" (col1 varchar, col2 number);"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.DYNAMIC_TABLES, "dynamic_table1","create or replace dynamic table db1.schema1.dynamic_table1 (col1 varchar, col2 number)\n as SELECT id, name, COUNT(*) as count FROM db1.schema1.source_table GROUP BY id, name;"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.MASKING_POLICIES, "masking_policy1","create or replace masking policy db1.schema1.masking_policy1 as (val string) returns string -> case when current_role() in ('ANALYST_ROLE', 'PUBLIC') then val else '****' end;"),
+                ScriptFactory.getSchemaScript("db1", "schema1", ScriptObjectType.FUNCTIONS, "function1","create or replace function db1.schema1.function1(arg1 varchar)\n" +
                         "RETURNS VARCHAR(16777216)\n" +
                         "LANGUAGE JAVASCRIPT\n" +
                         "AS '" +
@@ -296,12 +295,9 @@ void parseSchemaScriptTypeView() {
         String scriptType = "VIEWS";
         String content = "CREATE OR REPLACE VIEW db1.schema1.VIEW1 AS SELECT * FROM table1;";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
-
-        SchemaScript script = scripts.iterator().next();
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("VIEW1", script.getObjectName(), "Object name should be VIEW1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -316,12 +312,10 @@ void parseSchemaScriptTypeFunction() {
         String scriptType = "FUNCTIONS";
         String content = "CREATE OR REPLACE FUNCTION db1.schema1.FUNCTION1() RETURNS STRING LANGUAGE JAVASCRIPT AS 'return \"Hello\";';";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        assertNotNull(script, "Scripts should not be null");
 
-        SchemaScript script = scripts.iterator().next();
         assertEquals("FUNCTION1", script.getObjectName(), "Object name should be FUNCTION1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -336,12 +330,9 @@ void parseSchemaScriptTypeProcedure() {
         String scriptType = "PROCEDURES";
         String content = "CREATE OR REPLACE PROCEDURE db1.schema1.PROCEDURE1() RETURNS STRING LANGUAGE JAVASCRIPT AS 'return \"Hello\";';";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        SchemaScript script = scripts.iterator().next();
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("PROCEDURE1", script.getObjectName(), "Object name should be PROCEDURE1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -356,12 +347,9 @@ void parseSchemaScriptTypeFileFormat() {
         String scriptType = "FILE_FORMATS";
         String content = "CREATE OR REPLACE FILE FORMAT db1.schema1.FILE_FORMAT1 TYPE = 'CSV';";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
-
-        SchemaScript script = scripts.iterator().next();
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("FILE_FORMAT1", script.getObjectName(), "Object name should be FILE_FORMAT1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -381,20 +369,20 @@ void parseSchemaScriptTypeTable() {
 
         String expected_rollback = "drop table db1.schema1.TABLE1;";
         String expected_verify = "select * from db1.schema1.TABLE1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
-
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
-        assertEquals(0, script.getVersion(), "Version should be 0");
-        assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
-        assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
-        assertEquals("TABLE1", script.getObjectName(), "Object name should be TABLE1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
-        assertEquals(ScriptObjectType.TABLES, script.getObjectType(), "Object type should be TABLES");
-        assertEquals(content, script.getContent(), "Script content should match the input content");
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
+
+        MigrationScript migrationScript = schemaScript.getMigrations().get(0);
+        assertEquals(0, migrationScript.getVersion(), "Version should be 0");
+        assertEquals(expected_rollback, migrationScript.getRollback(), "Rollback should match the input content");
+        assertEquals(expected_verify, migrationScript.getVerify(), "Verify should match the input content");
+        assertEquals("TABLE1", migrationScript.getObjectName(), "Object name should be TABLE1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.TABLES, migrationScript.getObjectType(), "Object type should be TABLES");
+        assertEquals(content, migrationScript.getContent(), "Script content should match the input content");
     }
 
     @Test
@@ -410,20 +398,20 @@ void parseSchemaScriptTypeStream() {
 
         String expected_rollback = "drop stream db1.schema1.STREAM1;";
         String expected_verify = "select * from db1.schema1.STREAM1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
-
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
-        assertEquals(0, script.getVersion(), "Version should be 0");
-        assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
-        assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
-        assertEquals("STREAM1", script.getObjectName(), "Object name should be STREAM1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
-        assertEquals(ScriptObjectType.STREAMS, script.getObjectType(), "Object type should be STREAMS");
-        assertEquals(content, script.getContent(), "Script content should match the input content");
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
+
+        MigrationScript migrationScript = schemaScript.getMigrations().get(0);
+        assertEquals(0, migrationScript.getVersion(), "Version should be 0");
+        assertEquals(expected_rollback, migrationScript.getRollback(), "Rollback should match the input content");
+        assertEquals(expected_verify, migrationScript.getVerify(), "Verify should match the input content");
+        assertEquals("STREAM1", migrationScript.getObjectName(), "Object name should be STREAM1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.STREAMS, migrationScript.getObjectType(), "Object type should be STREAMS");
+        assertEquals(content, migrationScript.getContent(), "Script content should match the input content");
     }
 
     @Test
@@ -438,18 +426,18 @@ void parseSchemaScriptTypeSequence() {
 
         String expected_rollback = "drop sequence db1.schema1.SEQUENCE1;";
         String expected_verify = "select * from db1.schema1.SEQUENCE1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
 
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
+        MigrationScript script = schemaScript.getMigrations().get(0);
         assertEquals(0, script.getVersion(), "Version should be 0");
         assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
         assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
         assertEquals("SEQUENCE1", script.getObjectName(), "Object name should be SEQUENCE1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
         assertEquals(ScriptObjectType.SEQUENCES, script.getObjectType(), "Object type should be SEQUENCES");
         assertEquals(content, script.getContent(), "Script content should match the input content");
     }
@@ -466,18 +454,18 @@ void parseSchemaScriptTypeStage() {
 
         String expected_rollback = "drop stage db1.schema1.STAGE1;";
         String expected_verify = "list @db1.schema1.STAGE1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
 
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
+        MigrationScript script = schemaScript.getMigrations().get(0);
         assertEquals(0, script.getVersion(), "Version should be 0");
         assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
         assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
         assertEquals("STAGE1", script.getObjectName(), "Object name should be STAGE1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
         assertEquals(ScriptObjectType.STAGES, script.getObjectType(), "Object type should be STAGES");
         assertEquals(content, script.getContent(), "Script content should match the input content");
     }
@@ -494,18 +482,18 @@ void parseSchemaScriptTypeTask() {
 
         String expected_rollback = "drop task db1.schema1.TASK1;";
         String expected_verify = "select * from db1.schema1.TASK1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
 
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
+        MigrationScript script = schemaScript.getMigrations().get(0);
         assertEquals(0, script.getVersion(), "Version should be 0");
         assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
         assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
         assertEquals("TASK1", script.getObjectName(), "Object name should be TASK1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
         assertEquals(ScriptObjectType.TASKS, script.getObjectType(), "Object type should be TASKS");
         assertEquals(content, script.getContent(), "Script content should match the input content");
     }
@@ -520,12 +508,9 @@ void parseSchemaScriptTypeStreamlit() {
                 "\tmain_file='/streamlit_app.py'\n" +
                 "\tquery_warehouse='${MY_WAREHOUSE}';";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        SchemaScript script = scripts.iterator().next();
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("STREAMLIT1", script.getObjectName(), "Object name should be STREAMLIT1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -545,13 +530,10 @@ void parseSchemaScriptTypePipe() {
                          "  AS COPY INTO db1.schema1.my_table\n" +
                          "  FROM @my_stage/file_prefix\n" +
                          "  FILE_FORMAT = (TYPE = 'CSV');";
-    
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-    
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
-    
-        SchemaScript script = scripts.iterator().next();
+
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("PIPE1", script.getObjectName(), "Object name should be PIPE1");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
@@ -574,18 +556,18 @@ void parseSchemaScriptTypeDynamicTable() {
 
         String expected_rollback = "drop dynamic table db1.schema1.DYNAMIC_TABLE1;";
         String expected_verify = "select * from db1.schema1.DYNAMIC_TABLE1;";
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+        SchemaScript schemaScript = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        assertNotNull(schemaScript, "Scripts should not be null");
+        assertEquals(1, schemaScript.getMigrations().size(), "There should be exactly one migration script parsed");
 
-        MigrationScript script = (MigrationScript) scripts.iterator().next();
+        MigrationScript script = schemaScript.getMigrations().get(0);
         assertEquals(0, script.getVersion(), "Version should be 0");
         assertEquals(expected_rollback, script.getRollback(), "Rollback should match the input content");
         assertEquals(expected_verify, script.getVerify(), "Verify should match the input content");
         assertEquals("DYNAMIC_TABLE1", script.getObjectName(), "Object name should be DYNAMIC_TABLE1");
-        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
-        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals("db1".toUpperCase(), schemaScript.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), schemaScript.getSchemaName(), "Schema name should be schema1");
         assertEquals(ScriptObjectType.DYNAMIC_TABLES, script.getObjectType(), "Object type should be DYNAMIC_TABLES");
         assertEquals(content, script.getContent(), "Script content should match the input content");
     }
@@ -597,12 +579,9 @@ void parseSchemaScriptTypeMaskingPolicy() {
         String scriptType = "MASKING_POLICIES";
         String content = "CREATE OR REPLACE MASKING POLICY db1.schema1.EMAIL_MASK AS (val STRING) RETURNS STRING -> CASE WHEN CURRENT_ROLE() IN ('ADMIN') THEN val ELSE '***MASKED***' END;";
 
-        Set<SchemaScript> scripts = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
-
-        assertNotNull(scripts, "Scripts should not be null");
-        assertEquals(1, scripts.size(), "There should be exactly one script parsed");
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
 
-        SchemaScript script = scripts.iterator().next();
+        assertNotNull(script, "Scripts should not be null");
         assertEquals("EMAIL_MASK", script.getObjectName(), "Object name should be EMAIL_MASK");
         assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
         assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");

From e81b3b431323e9d9babc68f9f3f3a4886858cd9f Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Mon, 19 Jan 2026 23:05:01 -0800
Subject: [PATCH 3/5] Added network rules object type

---
 .../NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL   |  3 +-
 .../NETWORK_RULES/INTERNAL_IPS_RULE.SQL       |  7 ++
 .../dlsync/models/ScriptObjectType.java       | 76 +++++++++++--------
 3 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 example_scripts/main/example_db/MAIN_SCHEMA/NETWORK_RULES/INTERNAL_IPS_RULE.SQL

diff --git a/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL b/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
index ae617d5..36bc5a1 100644
--- a/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
+++ b/example_scripts/main/ACCOUNT/NETWORK_POLICIES/ALLOW_INTERNAL_IPS.SQL
@@ -1,4 +1,3 @@
 CREATE OR REPLACE NETWORK POLICY allow_internal_ips
-  ALLOWED_IP_LIST = ('10.0.0.0/8', '172.16.0.0/12')
-  BLOCKED_IP_LIST = ('192.168.1.100')
+  ALLOWED_NETWORK_RULE_LIST = (${EXAMPLE_DB}.${MAIN_SCHEMA}.INTERNAL_IPS_RULE)
   COMMENT = 'Network policy for internal access only';
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/NETWORK_RULES/INTERNAL_IPS_RULE.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/NETWORK_RULES/INTERNAL_IPS_RULE.SQL
new file mode 100644
index 0000000..d2306d5
--- /dev/null
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/NETWORK_RULES/INTERNAL_IPS_RULE.SQL
@@ -0,0 +1,7 @@
+CREATE OR REPLACE NETWORK RULE ${EXAMPLE_DB}.${MAIN_SCHEMA}.INTERNAL_IPS_RULE
+  MODE = INGRESS
+  TYPE = IPV4
+  VALUE_LIST = ('192.168.0.0/24', '192.168.1.0/24')
+  COMMENT = 'Example network rule for ingress traffic'
+;
+
diff --git a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
index 1e48299..1673c8b 100644
--- a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
+++ b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
@@ -1,49 +1,65 @@
 package com.snowflake.dlsync.models;
 
 public enum ScriptObjectType {
-    VIEWS("VIEW", false),
-    FUNCTIONS("FUNCTION", false),
-    PROCEDURES("PROCEDURE", false),
-    FILE_FORMATS("FILE FORMAT", false),
-    STREAMLITS("STREAMLIT", false),
-    PIPES("PIPE", false),
-    MASKING_POLICIES("MASKING POLICY", false),
-    RESOURCE_MONITORS("RESOURCE MONITOR", false),
-    NETWORK_POLICIES("NETWORK POLICY", false),
-    SESSION_POLICIES("SESSION POLICY", false),
-    PASSWORD_POLICIES("PASSWORD POLICY", false),
-    AUTHENTICATION_POLICIES("AUTHENTICATION POLICY", false),
-    API_INTEGRATIONS("API INTEGRATION", false),
-    NOTIFICATION_INTEGRATIONS("NOTIFICATION INTEGRATION", false),
-    SECURITY_INTEGRATIONS("SECURITY INTEGRATION", false),
-    STORAGE_INTEGRATIONS("STORAGE INTEGRATION", false),
-    WAREHOUSES("WAREHOUSE", false),
-
-    TABLES("TABLE", true),
-    STREAMS("STREAM", true),
-    SEQUENCES("SEQUENCE", true),
-    STAGES("STAGE", true),
-    TASKS("TASK", true),
-    ALERTS("ALERT", true),
-    DYNAMIC_TABLES("DYNAMIC TABLE", true),
-    DATABASES("DATABASE", true),
-    SCHEMAS("SCHEMA", true),
-    ROLES("ROLE", true);
+    VIEWS("VIEW", ObjectLevel.SCHEMA, false),
+    FUNCTIONS("FUNCTION", ObjectLevel.SCHEMA, false),
+    PROCEDURES("PROCEDURE", ObjectLevel.SCHEMA, false),
+    FILE_FORMATS("FILE FORMAT", ObjectLevel.SCHEMA, false),
+    STREAMLITS("STREAMLIT", ObjectLevel.SCHEMA, false),
+    PIPES("PIPE", ObjectLevel.SCHEMA, false),
+    MASKING_POLICIES("MASKING POLICY", ObjectLevel.SCHEMA, false),
+    NETWORK_RULES("NETWORK RULE", ObjectLevel.SCHEMA, false),
+    RESOURCE_MONITORS("RESOURCE MONITOR", ObjectLevel.ACCOUNT, false),
+    NETWORK_POLICIES("NETWORK POLICY", ObjectLevel.ACCOUNT, false),
+    SESSION_POLICIES("SESSION POLICY", ObjectLevel.ACCOUNT, false),
+    PASSWORD_POLICIES("PASSWORD POLICY", ObjectLevel.ACCOUNT, false),
+    AUTHENTICATION_POLICIES("AUTHENTICATION POLICY", ObjectLevel.ACCOUNT, false),
+    API_INTEGRATIONS("API INTEGRATION", ObjectLevel.ACCOUNT, false),
+    NOTIFICATION_INTEGRATIONS("NOTIFICATION INTEGRATION", ObjectLevel.ACCOUNT, false),
+    SECURITY_INTEGRATIONS("SECURITY INTEGRATION", ObjectLevel.ACCOUNT, false),
+    STORAGE_INTEGRATIONS("STORAGE INTEGRATION", ObjectLevel.ACCOUNT, false),
+    WAREHOUSES("WAREHOUSE", ObjectLevel.ACCOUNT, false),
+
+    // Migration-enabled objects
+    TABLES("TABLE", ObjectLevel.SCHEMA, true),
+    STREAMS("STREAM", ObjectLevel.SCHEMA, true),
+    SEQUENCES("SEQUENCE", ObjectLevel.SCHEMA, true),
+    STAGES("STAGE", ObjectLevel.SCHEMA, true),
+    TASKS("TASK", ObjectLevel.SCHEMA, true),
+    ALERTS("ALERT", ObjectLevel.SCHEMA, true),
+    DYNAMIC_TABLES("DYNAMIC TABLE", ObjectLevel.SCHEMA, true),
+    DATABASES("DATABASE", ObjectLevel.ACCOUNT, true),
+    SCHEMAS("SCHEMA", ObjectLevel.ACCOUNT, true),
+    ROLES("ROLE", ObjectLevel.ACCOUNT, true);
 
     private final String singular;
+    private final ObjectLevel level;
     private final boolean isMigration;
-    private ScriptObjectType(String type, boolean isMigration) {
+
+    ScriptObjectType(String type, ObjectLevel level, boolean isMigration) {
         this.singular = type;
+        this.level = level;
         this.isMigration = isMigration;
-
     }
+
     public String getSingular() {
         return singular;
     }
+
     public String getEscapedSingular() {
         return singular.replace(" ", "_");
     }
+
+    public ObjectLevel getLevel() {
+        return level;
+    }
+
     public boolean isMigration() {
         return isMigration;
     }
+
+    public enum ObjectLevel {
+        ACCOUNT,
+        SCHEMA
+    }
 }

From 3341664c8bfcda64c694f55b8c54e48a4584c32a Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Tue, 20 Jan 2026 13:52:37 -0800
Subject: [PATCH 4/5] Fixed git ignore issue with dir snowflake

---
 .gitignore                                    |  6 +-
 .../dlsync/models/AccountScript.java          | 43 +++++++++++
 .../snowflake/dlsync/models/SchemaScript.java | 76 +++++++++++++++++++
 3 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/snowflake/dlsync/models/AccountScript.java
 create mode 100644 src/main/java/com/snowflake/dlsync/models/SchemaScript.java

diff --git a/.gitignore b/.gitignore
index a99adc4..7627252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,7 @@ target/
 Jenkinsfile-app
 out/
 .vscode/
-Snowflake/
-*.p8
\ No newline at end of file
+/Snowflake/
+*.p8
+*.pem
+*.pub
diff --git a/src/main/java/com/snowflake/dlsync/models/AccountScript.java b/src/main/java/com/snowflake/dlsync/models/AccountScript.java
new file mode 100644
index 0000000..cf88f39
--- /dev/null
+++ b/src/main/java/com/snowflake/dlsync/models/AccountScript.java
@@ -0,0 +1,43 @@
+package com.snowflake.dlsync.models;
+
+import java.util.List;
+import java.util.Objects;
+
+public class AccountScript extends Script {
+
+    public AccountScript(String scriptPath, String objectName, ScriptObjectType objectType, String content) {
+        super(scriptPath, objectName, objectType, content);
+    }
+
+    public AccountScript(String scriptPath, String objectName, ScriptObjectType objectType, String content, List<MigrationScript> migrations) {
+        super(scriptPath, objectName, objectType, content, migrations);
+    }
+
+    @Override
+    public String getId() {
+        return getFullObjectName();
+    }
+
+    @Override
+    public String getFullObjectName() {
+        return getObjectName();
+    }
+
+    @Override
+    public String resolveObjectReference(String partialName) {
+        return partialName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode());
+    }
+}
diff --git a/src/main/java/com/snowflake/dlsync/models/SchemaScript.java b/src/main/java/com/snowflake/dlsync/models/SchemaScript.java
new file mode 100644
index 0000000..cd58635
--- /dev/null
+++ b/src/main/java/com/snowflake/dlsync/models/SchemaScript.java
@@ -0,0 +1,76 @@
+package com.snowflake.dlsync.models;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+public class SchemaScript extends Script {
+    private String databaseName;
+    private String schemaName;
+
+    public SchemaScript(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content) {
+        super(scriptPath, objectName, objectType, content);
+        this.databaseName = databaseName.toUpperCase();
+        this.schemaName = schemaName.toUpperCase();
+    }
+
+    public SchemaScript(String scriptPath, String databaseName, String schemaName, String objectName, ScriptObjectType objectType, String content, List<MigrationScript> migrations) {
+        super(scriptPath, objectName, objectType, content, migrations);
+        this.databaseName = databaseName.toUpperCase();
+        this.schemaName = schemaName.toUpperCase();
+    }
+
+    @Override
+    public String getId() {
+        return getFullObjectName();
+    }
+
+    @Override
+    public String getFullObjectName() {
+        return String.format("%s.%s.%s", databaseName, schemaName, getObjectName());
+    }
+
+    @Override
+    public String resolveObjectReference(String partialName) {
+        String[] objectHierarchy = partialName.split("\\.");
+        String fullyQualifiedName = "%s.%s.%s";
+        if(objectHierarchy.length == 1) {
+            fullyQualifiedName = String.format("%s.%s.%s", databaseName, schemaName,  objectHierarchy[0]);
+        }
+        else if(objectHierarchy.length == 2) {
+            fullyQualifiedName = String.format("%s.%s.%s", databaseName, objectHierarchy[0],  objectHierarchy[1]);
+        }
+        else if(objectHierarchy.length == 3) {
+            fullyQualifiedName = String.format("%s.%s.%s", objectHierarchy[0], objectHierarchy[1],  objectHierarchy[2]);
+        }
+        else {
+            log.error("Unknown dependency extracted: {} from script: {}", partialName, this);
+        }
+        return fullyQualifiedName.toUpperCase();
+    }
+
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    public void setDatabaseName(String databaseName) {
+        this.databaseName = databaseName.toUpperCase();
+    }
+
+    public String getSchemaName() {
+        return schemaName;
+    }
+
+    public void setSchemaName(String schemaName) {
+        this.schemaName = schemaName.toUpperCase();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), databaseName, schemaName);
+    }
+
+}
+

From c7b7f1ee6e0098677a990b507b5f6b9813ced728 Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Thu, 22 Jan 2026 22:08:42 -0800
Subject: [PATCH 5/5] Added unit test and fixed example scripts

---
 .gitignore                                    |   1 +
 build.gradle                                  |   2 +
 .../main/ACCOUNT/ROLES/USER_ROLE.SQL          |   2 +-
 .../SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL |   2 +-
 .../SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL  |   2 +-
 pom.xml                                       |  13 +-
 .../snowflake/dlsync/ChangeMangerFactory.java |  42 +-
 .../com/snowflake/dlsync/ScriptFactory.java   |  25 +-
 .../dependency/DependencyExtractor.java       |   3 -
 .../com/snowflake/dlsync/doa/ScriptRepo.java  |  28 +-
 .../snowflake/dlsync/ChangeManagerTest.java   | 426 ++++++++++++++++++
 .../snowflake/dlsync/doa/ScriptRepoTest.java  | 184 ++++++++
 .../dlsync/parser/SqlTokenizerTest.java       | 312 +++++++++++++
 13 files changed, 1002 insertions(+), 40 deletions(-)
 create mode 100644 src/test/java/com/snowflake/dlsync/ChangeManagerTest.java
 create mode 100644 src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java

diff --git a/.gitignore b/.gitignore
index 7627252..e5e362a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ out/
 *.p8
 *.pem
 *.pub
+/created_scripts/
diff --git a/build.gradle b/build.gradle
index 9f8ee5b..8b95002 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,8 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.13.4'
+    testImplementation 'org.mockito:mockito-core:5.20.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.20.0'
 }
 
 group = 'com.snowflake'
diff --git a/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL b/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
index cf93ff3..8bc4976 100644
--- a/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
+++ b/example_scripts/main/ACCOUNT/ROLES/USER_ROLE.SQL
@@ -11,4 +11,4 @@ GRANT USAGE ON DATABASE ${EXAMPLE_DB} TO ROLE USER_ROLE;
 ---version: 2, author: DlSync
 GRANT USAGE ON SCHEMA ${EXAMPLE_DB}.${MAIN_SCHEMA} TO ROLE USER_ROLE;
 ---verify: SHOW GRANTS TO ROLE USER_ROLE;
----rollback: REVOKE USAGE ON SCHEMA ${EXAMPLE_DB}.${MAIN_SCHEMA} FROM ROLE;
\ No newline at end of file
+---rollback: REVOKE USAGE ON SCHEMA ${EXAMPLE_DB}.${MAIN_SCHEMA} FROM ROLE USER_ROLE;
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
index 80ecbd8..4f3e337 100644
--- a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
+++ b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${AUDIT_SCHEMA}.SQL
@@ -1,4 +1,4 @@
 ---version: 0, author: DlSync
 CREATE SCHEMA IF NOT EXISTS ${EXAMPLE_DB}.${AUDIT_SCHEMA};
 ---rollback: DROP SCHEMA IF EXISTS ${EXAMPLE_DB}.${AUDIT_SCHEMA} CASCADE;
----verify: SHOW SCHEMA LIKE '${EXAMPLE_DB}.${AUDIT_SCHEMA}';
\ No newline at end of file
+---verify: SHOW SCHEMAS LIKE '${EXAMPLE_DB}.${AUDIT_SCHEMA}';
\ No newline at end of file
diff --git a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
index 642f486..4746b5d 100644
--- a/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
+++ b/example_scripts/main/ACCOUNT/SCHEMAS/${EXAMPLE_DB}.${MAIN_SCHEMA}.SQL
@@ -1,4 +1,4 @@
 ---version: 0, author: DlSync
 CREATE SCHEMA IF NOT EXISTS ${EXAMPLE_DB}.${MAIN_SCHEMA};
 ---rollback: DROP SCHEMA IF EXISTS ${EXAMPLE_DB}.${MAIN_SCHEMA} CASCADE;
----verify: SHOW SCHEMA LIKE '${EXAMPLE_DB}.${MAIN_SCHEMA}';
\ No newline at end of file
+---verify: SHOW SCHEMAS LIKE '${EXAMPLE_DB}.${MAIN_SCHEMA}';
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b9aa3ef..9c5992b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,18 @@
             <version>1.13.4</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.20.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>5.20.0</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
     <build>
diff --git a/src/main/java/com/snowflake/dlsync/ChangeMangerFactory.java b/src/main/java/com/snowflake/dlsync/ChangeMangerFactory.java
index a00fcd2..c751547 100644
--- a/src/main/java/com/snowflake/dlsync/ChangeMangerFactory.java
+++ b/src/main/java/com/snowflake/dlsync/ChangeMangerFactory.java
@@ -5,27 +5,61 @@
 import com.snowflake.dlsync.doa.ScriptRepo;
 import com.snowflake.dlsync.doa.ScriptSource;
 import com.snowflake.dlsync.parser.ParameterInjector;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
 
+@Slf4j
 public class ChangeMangerFactory {
-    public static ChangeManager createChangeManger() throws IOException {
+    public static ChangeManager createChangeManger() throws IOException, SQLException {
         ConfigManager configManager = new ConfigManager();
         return createChangeManger(configManager);
     }
 
-    public static ChangeManager createChangeManger(String scriptRoot, String profile) throws IOException {
+    public static ChangeManager createChangeManger(String scriptRoot, String profile) throws IOException, SQLException {
         ConfigManager configManager = new ConfigManager(scriptRoot, profile);
         return createChangeManger(configManager);
     }
 
-    public static ChangeManager createChangeManger(ConfigManager configManager) throws IOException {
+    public static ChangeManager createChangeManger(ConfigManager configManager) throws IOException, SQLException {
         configManager.init();
+
+        // Create connection
+        Connection connection = createConnection(configManager.getConfig().getConnection());
+
+        // Create dependencies
         ScriptSource scriptSource = new ScriptSource(configManager.getScriptRoot());
-        ScriptRepo scriptRepo = new ScriptRepo(configManager.getConfig().getConnection());
+        ScriptRepo scriptRepo = new ScriptRepo(connection, configManager.getConfig().getConnection());
+        scriptRepo.init();
         ParameterInjector parameterInjector = new ParameterInjector(configManager.getScriptParameters());
         DependencyExtractor dependencyExtractor = new DependencyExtractor();
         DependencyGraph dependencyGraph = new DependencyGraph(dependencyExtractor, configManager.getConfig());
+
         return new ChangeManager(configManager.getConfig(), scriptSource, scriptRepo, dependencyGraph, parameterInjector);
     }
+
+    /**
+     * Create a JDBC connection to Snowflake
+     */
+    private static Connection createConnection(Properties connectionProperties) throws SQLException {
+        String account = connectionProperties.getProperty("account");
+        if (account == null || account.isEmpty()) {
+            throw new SQLException("Missing 'account' property in connection configuration");
+        }
+
+        String jdbcUrl = "jdbc:snowflake://" + account + ".snowflakecomputing.com/";
+        log.debug("Creating Snowflake connection for account: {}", account);
+
+
+        try {
+            return DriverManager.getConnection(jdbcUrl, connectionProperties);
+        } catch (SQLException e) {
+            log.error("Failed to create Snowflake connection: {}", e.getMessage());
+            throw new SQLException("Unable to connect to Snowflake. Please check your account and connection properties.", e);
+        }
+    }
 }
diff --git a/src/main/java/com/snowflake/dlsync/ScriptFactory.java b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
index ae034f0..f18d5c3 100644
--- a/src/main/java/com/snowflake/dlsync/ScriptFactory.java
+++ b/src/main/java/com/snowflake/dlsync/ScriptFactory.java
@@ -30,19 +30,24 @@ public static MigrationScript getSchemaMigrationScript(String databaseName, Stri
         return new MigrationScript(schemaScript, content, version, author, rollback, verify);
     }
 
-    public static MigrationScript getSchemaMigrationScript(String fullObjectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
-        String databaseName = null, schemaName = null, objectName = null;
-        String[] nameSplit = fullObjectName.split("\\.");
-        if(nameSplit.length > 2) {
-            databaseName = nameSplit[0];
-            schemaName = nameSplit[1];
-            objectName = nameSplit[2];
+    public static MigrationScript getMigrationScript(String fullObjectName, ScriptObjectType objectType, String content, Long version, String author, String rollback, String verify) {
+        if(objectType.getLevel() == ScriptObjectType.ObjectLevel.ACCOUNT) {
+            AccountScript accountScript = getAccountScript(null, objectType, fullObjectName, content);
+            return new MigrationScript(accountScript, content, version, author, rollback, verify);
         }
         else {
-            log.error("Error while splitting fullObjectName {}: Missing some values", fullObjectName);
-            throw new RuntimeException("Error while splitting fullObjectName");
+            String databaseName = null, schemaName = null, objectName = null;
+            String[] nameSplit = fullObjectName.split("\\.");
+            if (nameSplit.length > 2) {
+                databaseName = nameSplit[0];
+                schemaName = nameSplit[1];
+                objectName = nameSplit[2];
+            } else {
+                log.error("Error while splitting fullObjectName {}: Missing some values", fullObjectName);
+                throw new RuntimeException("Error while splitting fullObjectName");
+            }
+            return getSchemaMigrationScript(databaseName, schemaName, objectType, objectName, content, version, author, rollback, verify);
         }
-        return getSchemaMigrationScript(databaseName, schemaName, objectType, objectName, content, version, author, rollback, verify);
 
     }
 
diff --git a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
index 2ca2a07..d8d21c0 100644
--- a/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
+++ b/src/main/java/com/snowflake/dlsync/dependency/DependencyExtractor.java
@@ -53,9 +53,6 @@ public Set<Script> extractScriptDependencies(Script script) {
     }
 
     private boolean isDependencyOf(Script dependency, Script target) {
-        if(target.getObjectName().equals("USER_ROLE") && dependency.getObjectName().equals("{EXAMPLE_DB}.${MAIN_SCHEMA}")) {
-            log.debug("User-role dependency found: {}", dependency);
-        }
         if(dependency.getObjectName().equals(target.getObjectName())) {
             log.debug("Found same object name with different schema: {}, {}", dependency, target);
         }
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
index 7b69c82..ee0047c 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
@@ -25,31 +25,21 @@ public class ScriptRepo {
     public final String DEPENDENCY_LINEAGE_TABLE_NAME = "DL_SYNC_DEPENDENCY_LINEAGE";
 
 
-    public ScriptRepo(Properties connectionProperties) {
-        log.debug("Repo initialized with the following properties: {}", connectionProperties);
+    public ScriptRepo(Connection connection, Properties connectionProperties) {
+        this.connection = connection;
         this.connectionProperties = connectionProperties;
-        try {
-            openConnection();
-            ResultSet resultSet = connection.createStatement().executeQuery("select current_database(), current_schema();");
-            resultSet.next();
-            log.info("Using database [{}] and schema [{}] for dlsync activities.", resultSet.getString(1), resultSet.getString(2));
-            initScriptTables();
-        } catch (SQLException e) {
-            log.error("Error while initializing the script repo: {} cause {}", e.getMessage(), e.getCause());
-            throw new RuntimeException(e);
-        }
+        log.debug("Repo initialized with connection and properties");
     }
 
-
-    private void openConnection() throws SQLException {
-        String jdbcUrl = "jdbc:snowflake://" + connectionProperties.getProperty("account") + ".snowflakecomputing.com/";
-        connectionProperties.remove("account");
-        log.debug("Connection opened with properties: {}", connectionProperties);
-        connection = DriverManager.getConnection(jdbcUrl, connectionProperties);
+    public void init() throws SQLException {
+        initScriptTables();
     }
 
     private void initScriptTables() throws SQLException {
         ////varchar OBJECT_NAME, varchar SCRIPT_HASH, varchar created_by, timestamp created_ts, varchar updated_by, timestamp updated_ts;
+        ResultSet resultSet = connection.createStatement().executeQuery("select current_database(), current_schema();");
+        resultSet.next();
+        log.info("Using database [{}] and schema [{}] for dlsync activities.", resultSet.getString(1), resultSet.getString(2));
         log.debug("Checking for deployment tables");
         try {
             String query = "SELECT * FROM " + CHANGE_SYNC_TABLE_NAME + " LIMIT 1;";
@@ -374,7 +364,7 @@ public List<MigrationScript> getDeployedMigrationScripts(Set<String> ids) throws
 
             String rollback = rs.getString("ROLLBACK_SCRIPT");
 
-            MigrationScript migrationScript = ScriptFactory.getSchemaMigrationScript(fullObjectName, objectType, "", version, null, rollback, null);
+            MigrationScript migrationScript = ScriptFactory.getMigrationScript(fullObjectName, objectType, "", version, null, rollback, null);
             migrations.add(migrationScript);
         }
         return migrations;
diff --git a/src/test/java/com/snowflake/dlsync/ChangeManagerTest.java b/src/test/java/com/snowflake/dlsync/ChangeManagerTest.java
new file mode 100644
index 0000000..b17dbb7
--- /dev/null
+++ b/src/test/java/com/snowflake/dlsync/ChangeManagerTest.java
@@ -0,0 +1,426 @@
+package com.snowflake.dlsync;
+
+import com.snowflake.dlsync.dependency.DependencyGraph;
+import com.snowflake.dlsync.doa.ScriptRepo;
+import com.snowflake.dlsync.doa.ScriptSource;
+import com.snowflake.dlsync.models.*;
+import com.snowflake.dlsync.parser.ParameterInjector;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.sql.SQLException;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+class ChangeManagerTest {
+
+    private ChangeManager changeManager;
+
+    @Mock
+    private Config mockConfig;
+
+    @Mock
+    private ScriptSource mockScriptSource;
+
+    @Mock
+    private ScriptRepo mockScriptRepo;
+
+    @Mock
+    private DependencyGraph mockDependencyGraph;
+
+    @Mock
+    private ParameterInjector mockParameterInjector;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        changeManager = new ChangeManager(
+            mockConfig,
+            mockScriptSource,
+            mockScriptRepo,
+            mockDependencyGraph,
+            mockParameterInjector
+        );
+    }
+
+    @Test
+    void testDeployMultipleChangedScriptsWithDependencyOrdering() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript tableScript = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES,
+            "MY_TABLE", "CREATE TABLE MY_TABLE(id INT);"
+        );
+
+        SchemaScript viewScript = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "MY_VIEW", "CREATE VIEW MY_VIEW AS SELECT * FROM MY_TABLE;"
+        );
+
+        SchemaScript functionScript = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.FUNCTIONS,
+            "MY_FUNC", "CREATE FUNCTION MY_FUNC() RETURNS INT AS 'SELECT COUNT(*) FROM MY_VIEW';"
+        );
+
+        List<Script> allScripts = Arrays.asList(tableScript, viewScript, functionScript);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+
+        List<Script> orderedScripts = Arrays.asList(tableScript, viewScript, functionScript);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(orderedScripts);
+
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.deploy(false);
+
+        verify(mockScriptRepo, times(3)).createScriptObject(any(), eq(false));
+
+        ArgumentCaptor<Script> scriptCaptor = ArgumentCaptor.forClass(Script.class);
+        verify(mockScriptRepo, times(3)).createScriptObject(scriptCaptor.capture(), eq(false));
+
+        List<Script> executedScripts = scriptCaptor.getAllValues();
+        assertEquals("MY_TABLE", executedScripts.get(0).getObjectName(), "TABLE should be deployed first");
+        assertEquals("MY_VIEW", executedScripts.get(1).getObjectName(), "VIEW should be deployed second");
+        assertEquals("MY_FUNC", executedScripts.get(2).getObjectName(), "FUNCTION should be deployed third");
+
+        verify(mockParameterInjector, times(3)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployWithNoChanges() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript script1 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW1", "CREATE VIEW VIEW1 AS SELECT 1;"
+        );
+
+        List<Script> allScripts = Collections.singletonList(script1);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(false);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.deploy(false);
+
+        verify(mockScriptRepo, never()).createScriptObject(any(), anyBoolean());
+        verify(mockParameterInjector, never()).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployWithManyScripts() throws SQLException, IOException, NoSuchAlgorithmException {
+        List<Script> allScripts = new ArrayList<>();
+        List<Script> changedScripts = new ArrayList<>();
+
+        for (int i = 0; i < 10; i++) {
+            SchemaScript script = ScriptFactory.getSchemaScript(
+                "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+                "VIEW_" + i, "CREATE VIEW VIEW_" + i + " AS SELECT " + i + ";"
+            );
+            allScripts.add(script);
+            changedScripts.add(script);
+        }
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(changedScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.deploy(false);
+
+        verify(mockScriptRepo, times(10)).createScriptObject(any(), eq(false));
+        verify(mockParameterInjector, times(10)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployOnlyHashesCallsCreateScriptObjectWithOnlyHashesTrue() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript script1 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW1", "CREATE VIEW VIEW1 AS SELECT 1;"
+        );
+        SchemaScript script2 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW2", "CREATE VIEW VIEW2 AS SELECT 2;"
+        );
+        SchemaScript script3 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW3", "CREATE VIEW VIEW3 AS SELECT 3;"
+        );
+
+        List<Script> allScripts = Arrays.asList(script1, script2, script3);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(allScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.deploy(true);
+
+        verify(mockScriptRepo, times(3)).createScriptObject(any(), eq(true));
+        verify(mockScriptRepo, never()).createScriptObject(any(), eq(false));
+        verify(mockParameterInjector, times(3)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testNormalDeployCallsCreateScriptObjectWithOnlyHashesFalse() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript script1 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW1", "CREATE VIEW VIEW1 AS SELECT 1;"
+        );
+        SchemaScript script2 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW2", "CREATE VIEW VIEW2 AS SELECT 2;"
+        );
+
+        List<Script> allScripts = Arrays.asList(script1, script2);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(allScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.deploy(false);
+
+        verify(mockScriptRepo, times(2)).createScriptObject(any(), eq(false));
+        verify(mockScriptRepo, never()).createScriptObject(any(), eq(true));
+        verify(mockParameterInjector, times(2)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployWithContinueOnFailureFalseThrowsOnFirstError() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript script1 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW1", "CREATE VIEW VIEW1 AS SELECT 1;"
+        );
+        SchemaScript script2 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW2", "CREATE VIEW VIEW2 AS SELECT 2;"
+        );
+        SchemaScript script3 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW3", "CREATE VIEW VIEW3 AS SELECT 3;"
+        );
+
+        List<Script> allScripts = Arrays.asList(script1, script2, script3);
+        List<Script> orderedScripts = new ArrayList<>(allScripts);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(orderedScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        doNothing()
+            .doThrow(new SQLException("View already exists"))
+            .doNothing()
+            .when(mockScriptRepo).createScriptObject(any(), eq(false));
+
+        assertThrows(SQLException.class, () -> {
+            changeManager.deploy(false);
+        }, "Should throw exception when continueOnFailure is false");
+
+        verify(mockScriptRepo, times(2)).createScriptObject(any(), eq(false));
+        verify(mockParameterInjector, atMost(2)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployWithContinueOnFailureTrueContinuesDespiteErrors() throws SQLException, IOException, NoSuchAlgorithmException {
+        SchemaScript script1 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW1", "CREATE VIEW VIEW1 AS SELECT 1;"
+        );
+        SchemaScript script2 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW2", "CREATE VIEW VIEW2 AS SELECT 2;"
+        );
+        SchemaScript script3 = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "VIEW3", "CREATE VIEW VIEW3 AS SELECT 3;"
+        );
+
+        List<Script> allScripts = Arrays.asList(script1, script2, script3);
+        List<Script> orderedScripts = new ArrayList<>(allScripts);
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(orderedScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(true);
+
+        doNothing()
+            .doThrow(new SQLException("View already exists"))
+            .doNothing()
+            .when(mockScriptRepo).createScriptObject(any(), eq(false));
+
+        assertThrows(RuntimeException.class, () -> {
+            changeManager.deploy(false);
+        }, "Should throw exception after attempting all scripts");
+
+        verify(mockScriptRepo, times(3)).createScriptObject(any(), eq(false));
+        verify(mockParameterInjector, times(3)).injectParameters(isA(Script.class));
+    }
+
+    @Test
+    void testDeployMultipleErrorsWithContinueOnFailureTrue() throws SQLException, IOException, NoSuchAlgorithmException {
+        List<Script> allScripts = new ArrayList<>();
+        List<Script> orderedScripts = new ArrayList<>();
+
+        for (int i = 1; i <= 4; i++) {
+            SchemaScript script = ScriptFactory.getSchemaScript(
+                "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+                "VIEW_" + i, "CREATE VIEW VIEW_" + i + " AS SELECT " + i + ";"
+            );
+            allScripts.add(script);
+            orderedScripts.add(script);
+        }
+
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(orderedScripts);
+        when(mockConfig.isContinueOnFailure()).thenReturn(true);
+
+        doNothing()
+            .doThrow(new SQLException("Error 1"))
+            .doNothing()
+            .doThrow(new SQLException("Error 2"))
+            .when(mockScriptRepo).createScriptObject(any(), eq(false));
+
+        assertThrows(RuntimeException.class, () -> {
+            changeManager.deploy(false);
+        }, "Should throw aggregated exception after all attempts");
+
+        verify(mockScriptRepo, times(4)).createScriptObject(any(), eq(false));
+    }
+
+    @Test
+    void testRollbackDeployedMigrationScriptsInReverseOrder() throws SQLException, IOException {
+        MigrationScript migration1 = ScriptFactory.getMigrationScript(
+            ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "MY_TABLE", ""),
+            "CREATE TABLE TEST_DB.TEST_SCHEMA.MY_TABLE(id INT);",
+            0L,
+            "admin",
+            "DROP TABLE IF EXISTS MY_TABLE;",
+            "SELECT COUNT(*) FROM MY_TABLE;"
+        );
+
+        MigrationScript migration2 = ScriptFactory.getMigrationScript(
+            ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS, "MY_VIEW", ""),
+            "CREATE VIEW TEST_DB.TEST_SCHEMA.MY_VIEW AS SELECT * FROM TEST_DB.TEST_SCHEMA.MY_TABLE;",
+            0L,
+            "admin",
+            "DROP VIEW IF EXISTS MY_VIEW;",
+            "SELECT COUNT(*) FROM MY_VIEW;"
+        );
+
+        List<MigrationScript> deployedMigrations = Arrays.asList(migration1, migration2);
+
+        when(mockScriptSource.getAllScripts()).thenReturn(Collections.emptyList());
+        when(mockScriptRepo.getDeployedMigrationScripts(any())).thenReturn(deployedMigrations);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(false);
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptRepo.loadScriptHash()).thenReturn(new HashSet<>(Arrays.asList("TABLE:MY_TABLE", "VIEW:MY_VIEW")));
+
+        List<Script> rollbackOrder = Arrays.asList(migration1, migration2);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(rollbackOrder);
+
+        changeManager.rollback();
+
+        ArgumentCaptor<MigrationScript> scriptCaptor = ArgumentCaptor.forClass(MigrationScript.class);
+        verify(mockScriptRepo, times(2)).executeRollback(scriptCaptor.capture());
+
+        List<MigrationScript> rollbackScripts = scriptCaptor.getAllValues();
+        assertEquals("MY_VIEW", rollbackScripts.get(0).getObjectName(),
+            "VIEW should be rolled back first (reverse order)");
+        assertEquals("MY_TABLE", rollbackScripts.get(1).getObjectName(),
+            "TABLE should be rolled back second");
+
+        verify(mockParameterInjector, times(2)).injectParametersAll(isA(MigrationScript.class));
+    }
+
+    @Test
+    void testRollbackWithMissingRollbackScripts() throws SQLException, IOException {
+        SchemaScript viewScript = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "MY_VIEW", "CREATE VIEW MY_VIEW AS SELECT 1;"
+        );
+
+        List<Script> allScripts = Collections.singletonList(viewScript);
+
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.getDeployedMigrationScripts(any())).thenReturn(Collections.emptyList());
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+        when(mockScriptRepo.isScriptChanged(any())).thenReturn(true);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(allScripts);
+
+        changeManager.rollback();
+
+        verify(mockScriptRepo, times(1)).createScriptObject(any(), eq(false));
+    }
+
+    @Test
+    void testRollbackWithNoDeployedScripts() throws SQLException, IOException {
+        when(mockScriptSource.getAllScripts()).thenReturn(Collections.emptyList());
+        when(mockScriptRepo.getDeployedMigrationScripts(any())).thenReturn(Collections.emptyList());
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+
+        changeManager.rollback();
+
+        verify(mockScriptRepo, never()).createScriptObject(any(), anyBoolean());
+    }
+
+    @Test
+    void testRollbackWithDeploymentChanges() throws SQLException, IOException {
+        SchemaScript newView = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "NEW_VIEW", "CREATE VIEW NEW_VIEW AS SELECT 1;"
+        );
+
+        SchemaScript changedView = ScriptFactory.getSchemaScript(
+            "TEST_DB", "TEST_SCHEMA", ScriptObjectType.VIEWS,
+            "CHANGED_VIEW", "CREATE VIEW CHANGED_VIEW AS SELECT 2;"
+        );
+
+        MigrationScript deployedTable = ScriptFactory.getMigrationScript(
+            ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.TABLES, "MY_TABLE", ""),
+            "CREATE TABLE MY_TABLE(id INT);",
+            0L,
+            "admin",
+            "DROP TABLE IF EXISTS MY_TABLE;",
+            null
+        );
+
+        List<Script> allScripts = Arrays.asList(newView, changedView);
+        List<MigrationScript> deployedMigrations = Collections.singletonList(deployedTable);
+
+        when(mockScriptSource.getAllScripts()).thenReturn(allScripts);
+        when(mockScriptRepo.getDeployedMigrationScripts(any())).thenReturn(deployedMigrations);
+        when(mockScriptRepo.isScriptChanged(any())).thenAnswer(invocation -> {
+            Script script = invocation.getArgument(0);
+            return script.getObjectName().equals("CHANGED_VIEW");
+        });
+        when(mockConfig.isContinueOnFailure()).thenReturn(false);
+        when(mockConfig.isScriptExcluded(any())).thenReturn(false);
+
+        List<Script> rollbackOrder = Arrays.asList(deployedTable, changedView);
+        when(mockDependencyGraph.topologicalSort()).thenReturn(rollbackOrder);
+
+        changeManager.rollback();
+
+        verify(mockScriptRepo, times(1)).createScriptObject(any(), eq(false));
+    }
+}
+
diff --git a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
new file mode 100644
index 0000000..1783142
--- /dev/null
+++ b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
@@ -0,0 +1,184 @@
+package com.snowflake.dlsync.doa;
+
+import com.snowflake.dlsync.models.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+class ScriptRepoTest {
+
+    @Mock
+    private Connection mockConnection;
+
+    @Mock
+    private Statement mockStatement;
+
+    @Mock
+    private PreparedStatement mockPreparedStatement;
+
+    @Mock
+    private ResultSet mockResultSet;
+
+    private ScriptRepo scriptRepo;
+
+    @BeforeEach
+    void setUp() throws SQLException {
+        MockitoAnnotations.openMocks(this);
+
+        when(mockConnection.createStatement()).thenReturn(mockStatement);
+        when(mockConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement);
+        when(mockConnection.getAutoCommit()).thenReturn(true);
+
+        when(mockStatement.executeQuery(anyString()))
+            .thenReturn(mockResultSet);
+
+        when(mockResultSet.next())
+            .thenReturn(true)
+            .thenReturn(true)
+            .thenReturn(false);
+
+        when(mockResultSet.getString(1)).thenReturn("TEST_DB");
+        when(mockResultSet.getString(2)).thenReturn("PUBLIC");
+        when(mockResultSet.getLong(1)).thenReturn(0L);
+
+        when(mockStatement.executeUpdate(anyString())).thenReturn(1);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo = createScriptRepoWithMockedConnection();
+
+        scriptRepo.insertChangeSync(ChangeType.DEPLOY, Status.IN_PROGRESS, "Test deployment");
+    }
+
+    @Test
+    void testCreateScriptObjectOnlyHashesFalseExecutesScript() throws SQLException {
+        SchemaScript script = new SchemaScript(
+            "test/MY_TABLE.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "MY_TABLE",
+            ScriptObjectType.TABLES,
+            "CREATE TABLE MY_TABLE (id INT, name VARCHAR);"
+        );
+        script.setHash("abc123def456");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(script, false);
+
+        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
+        verify(mockStatement, times(1)).execute(executeCaptor.capture());
+        assertEquals("CREATE TABLE MY_TABLE (id INT, name VARCHAR);", executeCaptor.getValue(),
+            "Script content should be executed when onlyHashes=false");
+
+        verify(mockConnection, atLeastOnce()).setAutoCommit(false);
+        verify(mockConnection, atLeastOnce()).setAutoCommit(true);
+        verify(mockConnection, atLeastOnce()).commit();
+
+        verify(mockPreparedStatement, atLeastOnce()).executeUpdate();
+    }
+
+    @Test
+    void testCreateScriptObjectOnlyHashesTrueSkipsScriptExecution() throws SQLException {
+        SchemaScript script = new SchemaScript(
+            "test/MY_VIEW.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "MY_VIEW",
+            ScriptObjectType.VIEWS,
+            "CREATE VIEW MY_VIEW AS SELECT * FROM MY_TABLE;"
+        );
+        script.setHash("xyz789uvw123");
+
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(script, true);
+
+        verify(mockStatement, never()).execute(anyString());
+
+        verify(mockConnection, atLeastOnce()).setAutoCommit(false);
+        verify(mockConnection, atLeastOnce()).setAutoCommit(true);
+        verify(mockConnection, atLeastOnce()).commit();
+
+        verify(mockPreparedStatement, atLeastOnce()).executeUpdate();
+    }
+
+    @Test
+    void testOnlyHashesParameterControls() throws SQLException {
+        SchemaScript scriptWithExecution = new SchemaScript(
+            "test/TABLE1.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "TABLE1",
+            ScriptObjectType.TABLES,
+            "CREATE TABLE TABLE1 (id INT);"
+        );
+        scriptWithExecution.setHash("hash001");
+
+        SchemaScript scriptHashOnly = new SchemaScript(
+            "test/TABLE2.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "TABLE2",
+            ScriptObjectType.TABLES,
+            "CREATE TABLE TABLE2 (id INT);"
+        );
+        scriptHashOnly.setHash("hash002");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(scriptWithExecution, false);
+        scriptRepo.createScriptObject(scriptHashOnly, true);
+
+        verify(mockStatement, times(1)).execute(anyString());
+
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(mockStatement, times(1)).execute(captor.capture());
+        assertEquals("CREATE TABLE TABLE1 (id INT);", captor.getValue(),
+            "Only the first script (onlyHashes=false) should be executed");
+    }
+
+    @Test
+    void testBothModeUpdateHashes() throws SQLException {
+        MigrationScript migrationScript = new MigrationScript(
+            new SchemaScript("test/MY_TABLE.sql", "TEST_DB", "TEST_SCHEMA", "MY_TABLE", ScriptObjectType.TABLES, ""),
+            "CREATE TABLE MY_TABLE (id INT);",
+            0L,
+            "admin",
+            "DROP TABLE MY_TABLE;",
+            "SELECT COUNT(*) FROM MY_TABLE;"
+        );
+        migrationScript.setHash("migration_hash");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(migrationScript, true);
+
+        verify(mockStatement, never()).execute(anyString());
+
+        verify(mockConnection, atLeastOnce()).prepareStatement(anyString());
+        verify(mockPreparedStatement, atLeastOnce()).executeUpdate();
+
+        verify(mockConnection, atLeastOnce()).commit();
+    }
+
+    private ScriptRepo createScriptRepoWithMockedConnection() throws SQLException {
+        Properties props = new Properties();
+        props.setProperty("account", "test_account");
+        return new ScriptRepo(mockConnection, props);
+    }
+}
+
+
+
diff --git a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
index 5af9773..c939395 100644
--- a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
@@ -616,4 +616,316 @@ void parseDdlScriptUnsupportedObjectType() {
                 "Exception message should indicate unsupported DDL statement");
     }
 
+    // ===== Account-Level Object Tests =====
+
+    @Test
+    void parseAccountScriptTypeDatabase() {
+        String filePath = "db_scripts/ACCOUNT/DATABASES/MY_DATABASE.SQL";
+        String name = "MY_DATABASE.SQL";
+        String scriptType = "DATABASES";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE DATABASE MY_DATABASE;\n" +
+                "---rollback: DROP DATABASE IF EXISTS MY_DATABASE;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("MY_DATABASE", script.getObjectName(), "Object name should be MY_DATABASE");
+        assertEquals(ScriptObjectType.DATABASES, script.getObjectType(), "Object type should be DATABASES");
+        assertEquals(1, script.getMigrations().size(), "There should be exactly one migration script parsed");
+
+        MigrationScript migration = script.getMigrations().get(0);
+        assertEquals(0, migration.getVersion(), "Version should be 0");
+        assertEquals("admin", migration.getAuthor(), "Author should be admin");
+        assertEquals("DROP DATABASE IF EXISTS MY_DATABASE;", migration.getRollback(), "Rollback should match");
+    }
+
+    @Test
+    void parseAccountScriptTypeSchema() {
+        String filePath = "db_scripts/ACCOUNT/SCHEMAS/MY_DATABASE.MY_SCHEMA.SQL";
+        String name = "MY_DATABASE.MY_SCHEMA.SQL";
+        String scriptType = "SCHEMAS";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE SCHEMA MY_DATABASE.MY_SCHEMA;\n" +
+                "---rollback: DROP SCHEMA IF EXISTS MY_DATABASE.MY_SCHEMA;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("MY_DATABASE.MY_SCHEMA", script.getObjectName(), "Object name should be MY_DATABASE.MY_SCHEMA");
+        assertEquals(ScriptObjectType.SCHEMAS, script.getObjectType(), "Object type should be SCHEMAS");
+        assertEquals(1, script.getMigrations().size(), "There should be exactly one migration script parsed");
+
+        MigrationScript migration = script.getMigrations().get(0);
+        assertEquals(0, migration.getVersion(), "Version should be 0");
+        assertEquals("admin", migration.getAuthor(), "Author should be admin");
+        assertEquals("DROP SCHEMA IF EXISTS MY_DATABASE.MY_SCHEMA;", migration.getRollback(), "Rollback should match");
+    }
+
+    @Test
+    void parseAccountScriptTypeRole() {
+        String filePath = "db_scripts/ACCOUNT/ROLES/ANALYST.SQL";
+        String name = "ANALYST.SQL";
+        String scriptType = "ROLES";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE ROLE ANALYST;\n" +
+                "---rollback: DROP ROLE IF EXISTS ANALYST;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("ANALYST", script.getObjectName(), "Object name should be ANALYST");
+        assertEquals(ScriptObjectType.ROLES, script.getObjectType(), "Object type should be ROLES");
+        assertEquals(1, script.getMigrations().size(), "There should be exactly one migration script parsed");
+
+        MigrationScript migration = script.getMigrations().get(0);
+        assertEquals(0, migration.getVersion(), "Version should be 0");
+        assertEquals("admin", migration.getAuthor(), "Author should be admin");
+        assertEquals("DROP ROLE IF EXISTS ANALYST;", migration.getRollback(), "Rollback should match");
+    }
+
+    @Test
+    void parseAccountScriptTypeWarehouse() {
+        String filePath = "db_scripts/ACCOUNT/WAREHOUSES/COMPUTE_WH.SQL";
+        String name = "COMPUTE_WH.SQL";
+        String scriptType = "WAREHOUSES";
+        String content = "CREATE OR REPLACE WAREHOUSE COMPUTE_WH WAREHOUSE_SIZE = 'MEDIUM';";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("COMPUTE_WH", script.getObjectName(), "Object name should be COMPUTE_WH");
+        assertEquals(ScriptObjectType.WAREHOUSES, script.getObjectType(), "Object type should be WAREHOUSES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeResourceMonitor() {
+        String filePath = "db_scripts/ACCOUNT/RESOURCE_MONITORS/MONITOR1.SQL";
+        String name = "MONITOR1.SQL";
+        String scriptType = "RESOURCE_MONITORS";
+        String content = "CREATE OR REPLACE RESOURCE MONITOR MONITOR1 CREDIT_QUOTA = 100 TRIGGERS ON 80 PERCENT DO NOTIFY;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("MONITOR1", script.getObjectName(), "Object name should be MONITOR1");
+        assertEquals(ScriptObjectType.RESOURCE_MONITORS, script.getObjectType(), "Object type should be RESOURCE_MONITORS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeNetworkPolicy() {
+        String filePath = "db_scripts/ACCOUNT/NETWORK_POLICIES/POLICY1.SQL";
+        String name = "POLICY1.SQL";
+        String scriptType = "NETWORK_POLICIES";
+        String content = "CREATE OR REPLACE NETWORK POLICY POLICY1 ALLOWED_NETWORK_RULE_LIST = ('rule1') BLOCKED_NETWORK_RULE_LIST = ();";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("POLICY1", script.getObjectName(), "Object name should be POLICY1");
+        assertEquals(ScriptObjectType.NETWORK_POLICIES, script.getObjectType(), "Object type should be NETWORK_POLICIES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeSessionPolicy() {
+        String filePath = "db_scripts/ACCOUNT/SESSION_POLICIES/SESSION_POLICY1.SQL";
+        String name = "SESSION_POLICY1.SQL";
+        String scriptType = "SESSION_POLICIES";
+        String content = "CREATE OR REPLACE SESSION POLICY SESSION_POLICY1 SESSION_IDLE_TIMEOUT_MINS = 30;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("SESSION_POLICY1", script.getObjectName(), "Object name should be SESSION_POLICY1");
+        assertEquals(ScriptObjectType.SESSION_POLICIES, script.getObjectType(), "Object type should be SESSION_POLICIES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypePasswordPolicy() {
+        String filePath = "db_scripts/ACCOUNT/PASSWORD_POLICIES/PWD_POLICY1.SQL";
+        String name = "PWD_POLICY1.SQL";
+        String scriptType = "PASSWORD_POLICIES";
+        String content = "CREATE OR REPLACE PASSWORD POLICY PWD_POLICY1 PASSWORD_MIN_LENGTH = 12 PASSWORD_MIN_UPPER_CASE_CHARS = 2;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("PWD_POLICY1", script.getObjectName(), "Object name should be PWD_POLICY1");
+        assertEquals(ScriptObjectType.PASSWORD_POLICIES, script.getObjectType(), "Object type should be PASSWORD_POLICIES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeAuthenticationPolicy() {
+        String filePath = "db_scripts/ACCOUNT/AUTHENTICATION_POLICIES/AUTH_POLICY1.SQL";
+        String name = "AUTH_POLICY1.SQL";
+        String scriptType = "AUTHENTICATION_POLICIES";
+        String content = "CREATE OR REPLACE AUTHENTICATION POLICY AUTH_POLICY1 AUTHENTICATION_METHODS = ('JWT') MFA_AUTHENTICATION_METHODS = ('PASSWORD', 'SAML');";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("AUTH_POLICY1", script.getObjectName(), "Object name should be AUTH_POLICY1");
+        assertEquals(ScriptObjectType.AUTHENTICATION_POLICIES, script.getObjectType(), "Object type should be AUTHENTICATION_POLICIES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeApiIntegration() {
+        String filePath = "db_scripts/ACCOUNT/API_INTEGRATIONS/API_INT1.SQL";
+        String name = "API_INT1.SQL";
+        String scriptType = "API_INTEGRATIONS";
+        String content = "CREATE OR REPLACE API INTEGRATION API_INT1 API_PROVIDER = 'aws_api_gateway' API_AWS_ROLE_ARN = 'arn:aws:iam::123456789012:role/my_role';";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("API_INT1", script.getObjectName(), "Object name should be API_INT1");
+        assertEquals(ScriptObjectType.API_INTEGRATIONS, script.getObjectType(), "Object type should be API_INTEGRATIONS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeNotificationIntegration() {
+        String filePath = "db_scripts/ACCOUNT/NOTIFICATION_INTEGRATIONS/NOTIF_INT1.SQL";
+        String name = "NOTIF_INT1.SQL";
+        String scriptType = "NOTIFICATION_INTEGRATIONS";
+        String content = "CREATE OR REPLACE NOTIFICATION INTEGRATION NOTIF_INT1 TYPE = 'EMAIL' ENABLED = TRUE;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("NOTIF_INT1", script.getObjectName(), "Object name should be NOTIF_INT1");
+        assertEquals(ScriptObjectType.NOTIFICATION_INTEGRATIONS, script.getObjectType(), "Object type should be NOTIFICATION_INTEGRATIONS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeSecurityIntegration() {
+        String filePath = "db_scripts/ACCOUNT/SECURITY_INTEGRATIONS/SEC_INT1.SQL";
+        String name = "SEC_INT1.SQL";
+        String scriptType = "SECURITY_INTEGRATIONS";
+        String content = "CREATE OR REPLACE SECURITY INTEGRATION SEC_INT1 TYPE = 'SAML2' ENABLED = TRUE SAML2_LOGIN_URL = 'https://example.com/login';";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("SEC_INT1", script.getObjectName(), "Object name should be SEC_INT1");
+        assertEquals(ScriptObjectType.SECURITY_INTEGRATIONS, script.getObjectType(), "Object type should be SECURITY_INTEGRATIONS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseAccountScriptTypeStorageIntegration() {
+        String filePath = "db_scripts/ACCOUNT/STORAGE_INTEGRATIONS/STORAGE_INT1.SQL";
+        String name = "STORAGE_INT1.SQL";
+        String scriptType = "STORAGE_INTEGRATIONS";
+        String content = "CREATE OR REPLACE STORAGE INTEGRATION STORAGE_INT1 TYPE = 'EXTERNAL_STAGE' STORAGE_PROVIDER = 'S3' STORAGE_AWS_ROLE_ARN = 'arn:aws:iam::123456789012:role/my_role';";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("STORAGE_INT1", script.getObjectName(), "Object name should be STORAGE_INT1");
+        assertEquals(ScriptObjectType.STORAGE_INTEGRATIONS, script.getObjectType(), "Object type should be STORAGE_INTEGRATIONS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    // ===== Account-Level Multi-Version Migration Tests =====
+
+    @Test
+    void parseAccountScriptTypeDatabaseMultipleMigrations() {
+        String filePath = "db_scripts/ACCOUNT/DATABASES/MY_DATABASE.SQL";
+        String name = "MY_DATABASE.SQL";
+        String scriptType = "DATABASES";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE DATABASE MY_DATABASE;\n" +
+                "---rollback: DROP DATABASE IF EXISTS MY_DATABASE;\n" +
+                "---version: 1, author: user1\n" +
+                "ALTER DATABASE MY_DATABASE SET DATA_RETENTION_TIME_IN_DAYS = 7;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("MY_DATABASE", script.getObjectName(), "Object name should be MY_DATABASE");
+        assertEquals(ScriptObjectType.DATABASES, script.getObjectType(), "Object type should be DATABASES");
+        assertEquals(2, script.getMigrations().size(), "There should be exactly two migration scripts parsed");
+
+        MigrationScript firstMigration = script.getMigrations().get(0);
+        assertEquals(0, firstMigration.getVersion(), "First version should be 0");
+        assertEquals("admin", firstMigration.getAuthor(), "First author should be admin");
+        assertEquals("DROP DATABASE IF EXISTS MY_DATABASE;", firstMigration.getRollback(), "First rollback should match");
+
+        MigrationScript secondMigration = script.getMigrations().get(1);
+        assertEquals(1, secondMigration.getVersion(), "Second version should be 1");
+        assertEquals("user1", secondMigration.getAuthor(), "Second author should be user1");
+    }
+
+    @Test
+    void parseAccountScriptTypeSchemaMultipleMigrations() {
+        String filePath = "db_scripts/ACCOUNT/SCHEMAS/MY_DATABASE.MY_SCHEMA.SQL";
+        String name = "MY_DATABASE.MY_SCHEMA.SQL";
+        String scriptType = "SCHEMAS";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE SCHEMA MY_DATABASE.MY_SCHEMA;\n" +
+                "---rollback: DROP SCHEMA IF EXISTS MY_DATABASE.MY_SCHEMA;\n" +
+                "---version: 1, author: user1\n" +
+                "ALTER SCHEMA MY_DATABASE.MY_SCHEMA SET DATA_RETENTION_TIME_IN_DAYS = 5;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("MY_DATABASE.MY_SCHEMA", script.getObjectName(), "Object name should be MY_DATABASE.MY_SCHEMA");
+        assertEquals(ScriptObjectType.SCHEMAS, script.getObjectType(), "Object type should be SCHEMAS");
+        assertEquals(2, script.getMigrations().size(), "There should be exactly two migration scripts parsed");
+
+        MigrationScript firstMigration = script.getMigrations().get(0);
+        assertEquals(0, firstMigration.getVersion(), "First version should be 0");
+        assertEquals("admin", firstMigration.getAuthor(), "First author should be admin");
+        assertEquals("DROP SCHEMA IF EXISTS MY_DATABASE.MY_SCHEMA;", firstMigration.getRollback(), "First rollback should match");
+
+        MigrationScript secondMigration = script.getMigrations().get(1);
+        assertEquals(1, secondMigration.getVersion(), "Second version should be 1");
+        assertEquals("user1", secondMigration.getAuthor(), "Second author should be user1");
+    }
+
+    @Test
+    void parseAccountScriptTypeRoleMultipleMigrations() {
+        String filePath = "db_scripts/ACCOUNT/ROLES/ANALYST.SQL";
+        String name = "ANALYST.SQL";
+        String scriptType = "ROLES";
+        String content = "---version: 0, author: admin\n" +
+                "CREATE OR REPLACE ROLE ANALYST;\n" +
+                "---rollback: DROP ROLE IF EXISTS ANALYST;\n" +
+                "---version: 1, author: admin\n" +
+                "GRANT ROLE ANALYST TO ROLE ACCOUNTADMIN;\n" +
+                "---rollback: REVOKE ROLE ANALYST FROM ROLE ACCOUNTADMIN;\n" +
+                "---version: 2, author: user2\n" +
+                "GRANT CREATE DATABASE ON ACCOUNT TO ROLE ANALYST;";
+
+        AccountScript script = SqlTokenizer.parseAccountScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("ANALYST", script.getObjectName(), "Object name should be ANALYST");
+        assertEquals(ScriptObjectType.ROLES, script.getObjectType(), "Object type should be ROLES");
+        assertEquals(3, script.getMigrations().size(), "There should be exactly three migration scripts parsed");
+
+        MigrationScript firstMigration = script.getMigrations().get(0);
+        assertEquals(0, firstMigration.getVersion(), "First version should be 0");
+        assertEquals("admin", firstMigration.getAuthor(), "First author should be admin");
+
+        MigrationScript secondMigration = script.getMigrations().get(1);
+        assertEquals(1, secondMigration.getVersion(), "Second version should be 1");
+        assertEquals("REVOKE ROLE ANALYST FROM ROLE ACCOUNTADMIN;", secondMigration.getRollback(), "Second rollback should match");
+
+        MigrationScript thirdMigration = script.getMigrations().get(2);
+        assertEquals(2, thirdMigration.getVersion(), "Third version should be 2");
+        assertEquals("user2", thirdMigration.getAuthor(), "Third author should be user2");
+    }
+
+
+
 }
\ No newline at end of file