diff --git a/digitalai/release/integration/input_context.py b/digitalai/release/integration/input_context.py
index f0c02f5..f6f0935 100644
--- a/digitalai/release/integration/input_context.py
+++ b/digitalai/release/integration/input_context.py
@@ -116,7 +116,7 @@ def script_location(self) -> str:
         Returns:
         - str: The value of the 'scriptLocation' property.
         """
-        return next(p.value for p in self.properties if p.name == 'scriptLocation')
+        return next((p.value for p in self.properties if p.name == 'scriptLocation'), '')
 
 
 @dataclass_json
diff --git a/digitalai/release/integration/wrapper.py b/digitalai/release/integration/wrapper.py
index 86a0445..52761eb 100644
--- a/digitalai/release/integration/wrapper.py
+++ b/digitalai/release/integration/wrapper.py
@@ -120,14 +120,14 @@ def get_task_details():
     #dai_logger.info("Successfully decrypted input context")
     global input_context
     input_context = InputContext.from_dict(json.loads(decrypted_json))
-
     secrets = input_context.task.secrets()
     if input_context.release and input_context.release.automated_task_as_user and input_context.release.automated_task_as_user.password:
         secrets.append(input_context.release.automated_task_as_user.password)
     masked_std_out.secrets = secrets
     masked_std_err.secrets = secrets
     task_properties = input_context.task.build_locals()
-    return task_properties, input_context.task.type
+    script_path = input_context.task.script_location()
+    return task_properties, input_context.task.type, script_path
 
 
 def update_output_context(output_context: OutputContext):
@@ -239,14 +239,36 @@ def run():
     try:
         # Get task details, parse the script file to get the task class, import the module,
         # create an instance of the task class, and execute the task
-        task_props, task_type = get_task_details()
+        task_props, task_type, script_path = get_task_details()
         task_class_name = task_type.split(".")[1]
-        class_file_path = find_class_file(os.getcwd(), task_class_name)
-        if not class_file_path:
-            raise ValueError(f"Could not find the {task_class_name} class")
-        module_name = class_file_path.replace(os.getcwd() + os.sep, '')
-        module_name = module_name.replace(".py", "").replace(os.sep, ".")
-        module = importlib.import_module(module_name)
+
+        if script_path:
+            script_path = script_path.lstrip("/\\")
+            script_path = script_path.replace("/", os.sep).replace("\\", os.sep)
+
+            full_path = os.path.join(os.getcwd(), "src", script_path)
+            relative_path = os.path.join("src", script_path)
+
+            if not os.path.isfile(full_path):
+                raise ValueError(f"Script file not found at: {relative_path}")
+
+            module_name = full_path.replace(os.getcwd() + os.sep, "")
+            module_name = module_name.replace(".py", "").replace(os.sep, ".")
+            module = importlib.import_module(module_name)
+
+            if not hasattr(module, task_class_name):
+                raise ValueError(
+                    f"Class '{task_class_name}' not found in script file: {relative_path}"
+                )
+
+        else:
+            class_file_path = find_class_file(os.getcwd(), task_class_name)
+            if not class_file_path:
+                raise ValueError(f"Could not find the '{task_class_name}' class")
+            module_name = class_file_path.replace(os.getcwd() + os.sep, "")
+            module_name = module_name.replace(".py", "").replace(os.sep, ".")
+            module = importlib.import_module(module_name)
+
         task_class = getattr(module, task_class_name)
         task_obj = task_class()
         task_obj.input_properties = task_props
diff --git a/tests/release/integration/src/hello.py b/tests/release/integration/src/hello.py
new file mode 100644
index 0000000..83bb992
--- /dev/null
+++ b/tests/release/integration/src/hello.py
@@ -0,0 +1,24 @@
+from digitalai.release.integration import BaseTask
+from digitalai.release.integration import dai_logger
+
+class Hello(BaseTask):
+    """
+       The purpose of this task is to greet by the given name.
+    """
+    def execute(self) -> None:
+        name = self.input_properties['yourName']
+        if not name:
+            raise ValueError("The 'name' field cannot be empty")
+
+        greeting = f"Hello {name}"
+
+        dai_logger.info(f"get_release_server_url() : {self.get_release_server_url()}")
+        dai_logger.info(f"get_task_user() : {self.get_task_user()}")
+        dai_logger.info(f"get_release_id() : {self.get_release_id()}")
+        dai_logger.info(f"get_task_id() : {self.get_task_id()}")
+
+        # Add to the comment section of the task in the UI
+        self.add_comment(greeting)
+
+        self.set_output_property('greeting', greeting)
+
diff --git a/tests/release/integration/src/sample/hello.py b/tests/release/integration/src/sample/hello.py
new file mode 100644
index 0000000..a4c94ba
--- /dev/null
+++ b/tests/release/integration/src/sample/hello.py
@@ -0,0 +1,27 @@
+from digitalai.release.integration import BaseTask
+from digitalai.release.integration import dai_logger
+
+class Hello1(BaseTask):
+    """
+       The purpose of this task is to greet by the given name.
+    """
+    def execute(self) -> None:
+
+        print("Inside Sample Folder - Hello Task")
+
+        name = self.input_properties['yourName']
+        if not name:
+            raise ValueError("The 'name' field cannot be empty")
+
+        greeting = f"Hello {name}"
+
+        dai_logger.info(f"get_release_server_url() : {self.get_release_server_url()}")
+        dai_logger.info(f"get_task_user() : {self.get_task_user()}")
+        dai_logger.info(f"get_release_id() : {self.get_release_id()}")
+        dai_logger.info(f"get_task_id() : {self.get_task_id()}")
+
+        # Add to the comment section of the task in the UI
+        self.add_comment(greeting)
+
+        self.set_output_property('greeting', greeting)
+