From 64a05f8140fb9451feef5e551ed36217678ea999 Mon Sep 17 00:00:00 2001
From: Alec Lorimer <alec.lorimer@smartthings.com>
Date: Mon, 17 Nov 2025 15:25:22 -0600
Subject: [PATCH] CHAD-17098: zwave-window-treatment lazy loading of
 sub-drivers

---
 .../src/aeotec-nano-shutter/can_handle.lua    | 14 +++++++
 .../src/aeotec-nano-shutter/fingerprints.lua  | 11 ++++++
 .../src/aeotec-nano-shutter/init.lua          | 32 ++--------------
 .../iblinds-window-treatment/can_handle.lua   | 14 +++++++
 .../iblinds-window-treatment/fingerprints.lua | 10 +++++
 .../src/iblinds-window-treatment/init.lua     | 35 +++---------------
 .../iblinds-window-treatment/sub_drivers.lua  |  8 ++++
 .../v3/can_handle.lua                         | 19 ++++++++++
 .../v3/fingerprints.lua                       |  9 +++++
 .../{v3.lua => v3/init.lua}                   | 16 ++------
 .../zwave-window-treatment/src/init.lua       | 23 ++----------
 .../src/lazy_load_subdriver.lua               | 18 +++++++++
 .../src/preferences.lua                       | 16 ++------
 .../can_handle.lua                            | 14 +++++++
 .../fingerprints.lua                          |  9 +++++
 .../src/springs-window-fashion-shade/init.lua | 30 ++-------------
 .../src/sub_drivers.lua                       | 11 ++++++
 .../src/test/test_fibaro_roller_shutter.lua   | 16 ++------
 .../src/test/test_qubino_flush_shutter.lua    | 16 ++------
 .../test/test_zwave_aeotec_nano_shutter.lua   | 16 ++------
 .../test_zwave_iblinds_window_treatment.lua   | 16 ++------
 .../test_zwave_springs_window_treatment.lua   | 16 ++------
 .../src/test/test_zwave_window_treatment.lua  | 16 ++------
 .../window-treatment-venetian/can_handle.lua  | 14 +++++++
 .../fibaro-roller-shutter/can_handle.lua      | 14 +++++++
 .../fibaro-roller-shutter/fingerprints.lua    |  8 ++++
 .../fibaro-roller-shutter/init.lua            | 29 ++-------------
 .../fingerprints.lua                          | 10 +++++
 .../src/window-treatment-venetian/init.lua    | 37 +++----------------
 .../qubino-flush-shutter/can_handle.lua       | 14 +++++++
 .../qubino-flush-shutter/fingerprints.lua     |  9 +++++
 .../qubino-flush-shutter/init.lua             | 30 ++-------------
 .../window-treatment-venetian/sub_drivers.lua |  9 +++++
 .../src/window_preset_defaults.lua            | 18 ++-------
 34 files changed, 274 insertions(+), 303 deletions(-)
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/sub_drivers.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/fingerprints.lua
 rename drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/{v3.lua => v3/init.lua} (84%)
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/lazy_load_subdriver.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/sub_drivers.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/can_handle.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/fingerprints.lua
 create mode 100644 drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/sub_drivers.lua

diff --git a/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/can_handle.lua
new file mode 100644
index 0000000000..7caf966d19
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_aeotec_nano_shutter(opts, driver, device, ...)
+  local FINGERPRINTS = require("aeotec-nano-shutter.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("aeotec-nano-shutter")
+    end
+  end
+  return false
+end
+
+return can_handle_aeotec_nano_shutter
diff --git a/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/fingerprints.lua
new file mode 100644
index 0000000000..dcbcf2f872
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/fingerprints.lua
@@ -0,0 +1,11 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local AEOTEC_NANO_SHUTTER_FINGERPRINTS = {
+  {mfr = 0x0086, prod = 0x0003, model = 0x008D}, -- Aeotec nano shutter EU
+  {mfr = 0x0086, prod = 0x0103, model = 0x008D}, -- Aeotec nano shutter US
+  {mfr = 0x0371, prod = 0x0003, model = 0x008D}, -- Aeotec nano shutter EU
+  {mfr = 0x0371, prod = 0x0103, model = 0x008D} -- Aeotec nano shutter US
+}
+
+return AEOTEC_NANO_SHUTTER_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/init.lua b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/init.lua
index 6ca6fd7837..82977a7cfb 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/aeotec-nano-shutter/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
@@ -28,26 +18,12 @@ local SET_BUTTON_TO_CLOSE = "close"
 local SET_BUTTON_TO_PAUSE = "pause"
 local SHADE_STATE = "shade_state"
 
-local AEOTEC_NANO_SHUTTER_FINGERPRINTS = {
-  {mfr = 0x0086, prod = 0x0003, model = 0x008D}, -- Aeotec nano shutter EU
-  {mfr = 0x0086, prod = 0x0103, model = 0x008D}, -- Aeotec nano shutter US
-  {mfr = 0x0371, prod = 0x0003, model = 0x008D}, -- Aeotec nano shutter EU
-  {mfr = 0x0371, prod = 0x0103, model = 0x008D} -- Aeotec nano shutter US
-}
 
 --- Determine whether the passed device is proper
 ---
 --- @param driver st.zwave.Driver
 --- @param device st.zwave.Device
 --- @return boolean true if the device is proper, else false
-local function can_handle_aeotec_nano_shutter(opts, driver, device, ...)
-  for _, fingerprint in ipairs(AEOTEC_NANO_SHUTTER_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 --- Default handler for basic reports for the devices
 ---
@@ -140,7 +116,7 @@ local aeotec_nano_shutter = {
     added = added_handler
   },
   NAME = "Aeotec nano shutter",
-  can_handle = can_handle_aeotec_nano_shutter
+  can_handle = require("aeotec-nano-shutter.can_handle"),
 }
 
 return aeotec_nano_shutter
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/can_handle.lua
new file mode 100644
index 0000000000..881ebd36a3
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_iblinds_window_treatment(opts, driver, device, ...)
+  local FINGERPRINTS = require("iblinds-window-treatment.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("iblinds-window-treatment")
+    end
+  end
+  return false
+end
+
+return can_handle_iblinds_window_treatment
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/fingerprints.lua
new file mode 100644
index 0000000000..d4f652f8b9
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/fingerprints.lua
@@ -0,0 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local IBLINDS_WINDOW_TREATMENT_FINGERPRINTS = {
+  {mfr = 0x0287, prod = 0x0003, model = 0x000D}, -- iBlinds Window Treatment v1 / v2
+  {mfr = 0x0287, prod = 0x0004, model = 0x0071}, -- iBlinds Window Treatment v3
+  {mfr = 0x0287, prod = 0x0004, model = 0x0072}  -- iBlinds Window Treatment v3.1
+}
+
+return IBLINDS_WINDOW_TREATMENT_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/init.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/init.lua
index 690e50d694..9c3d2d9970 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/init.lua
@@ -1,41 +1,18 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass.SwitchMultilevel
 local SwitchMultilevel = (require "st.zwave.CommandClass.SwitchMultilevel")({ version=3 })
 local window_preset_defaults = require "window_preset_defaults"
 
-local IBLINDS_WINDOW_TREATMENT_FINGERPRINTS = {
-  {mfr = 0x0287, prod = 0x0003, model = 0x000D}, -- iBlinds Window Treatment v1 / v2
-  {mfr = 0x0287, prod = 0x0004, model = 0x0071}, -- iBlinds Window Treatment v3
-  {mfr = 0x0287, prod = 0x0004, model = 0x0072}  -- iBlinds Window Treatment v3.1
-}
 
 --- Determine whether the passed device is iblinds window treatment
 ---
 --- @param driver st.zwave.Driver
 --- @param device st.zwave.Device
 --- @return boolean true if the device is iblinds window treatment, else false
-local function can_handle_iblinds_window_treatment(opts, driver, device, ...)
-  for _, fingerprint in ipairs(IBLINDS_WINDOW_TREATMENT_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local capability_handlers = {}
 
@@ -91,11 +68,9 @@ local iblinds_window_treatment = {
       [capabilities.windowShadePreset.commands.presetPosition.NAME] = capability_handlers.preset_position
     }
   },
-  sub_drivers = {
-    require("iblinds-window-treatment.v3")
-  },
+  sub_drivers = require("iblinds-window-treatment.sub_drivers"),
   NAME = "iBlinds window treatment",
-  can_handle = can_handle_iblinds_window_treatment
+  can_handle = require("iblinds-window-treatment.can_handle"),
 }
 
 return iblinds_window_treatment
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/sub_drivers.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/sub_drivers.lua
new file mode 100644
index 0000000000..187ef0ee04
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/sub_drivers.lua
@@ -0,0 +1,8 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local lazy_load_if_possible = require("lazy_load_subdriver")
+
+return {
+    lazy_load_if_possible("iblinds-window-treatment.v3")
+}
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/can_handle.lua
new file mode 100644
index 0000000000..ababe18ac6
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/can_handle.lua
@@ -0,0 +1,19 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+--- Determine whether the passed device is iblinds window treatment v3
+---
+--- @param driver st.zwave.Driver
+--- @param device st.zwave.Device
+--- @return boolean true if the device is iblinds window treatment, else false
+local function can_handle_iblinds_window_treatment_v3(opts, driver, device, ...)
+  local FINGERPRINTS = require("iblinds-window-treatment.v3.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("iblinds-window-treatment.v3")
+    end
+  end
+  return false
+end
+
+return can_handle_iblinds_window_treatment_v3
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/fingerprints.lua
new file mode 100644
index 0000000000..ee256ea18a
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/fingerprints.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local IBLINDS_WINDOW_TREATMENT_FINGERPRINTS_V3 = {
+  {mfr = 0x0287, prod = 0x0004, model = 0x0071}, -- iBlinds Window Treatment v3
+  {mfr = 0x0287, prod = 0x0004, model = 0x0072}  -- iBlinds Window Treatment v3
+}
+
+return IBLINDS_WINDOW_TREATMENT_FINGERPRINTS_V3
diff --git a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3.lua b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/init.lua
similarity index 84%
rename from drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3.lua
rename to drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/init.lua
index 9e0a38775d..c0bb8bc363 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/iblinds-window-treatment/v3/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass.SwitchMultilevel
diff --git a/drivers/SmartThings/zwave-window-treatment/src/init.lua b/drivers/SmartThings/zwave-window-treatment/src/init.lua
index aaaf5c7889..b2597d9f61 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.defaults
@@ -84,12 +74,7 @@ local driver_template = {
       [capabilities.windowShadePreset.commands.presetPosition.NAME] = window_preset_defaults.window_shade_preset_cmd,
     }
   },
-  sub_drivers = {
-    require("springs-window-fashion-shade"),
-    require("iblinds-window-treatment"),
-    require("window-treatment-venetian"),
-    require("aeotec-nano-shutter")
-  }
+  sub_drivers = require("sub_drivers"),
 }
 
 defaults.register_for_default_handlers(driver_template, driver_template.supported_capabilities)
diff --git a/drivers/SmartThings/zwave-window-treatment/src/lazy_load_subdriver.lua b/drivers/SmartThings/zwave-window-treatment/src/lazy_load_subdriver.lua
new file mode 100644
index 0000000000..45115081e4
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/lazy_load_subdriver.lua
@@ -0,0 +1,18 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+return function(sub_driver_name)
+  -- gets the current lua libs api version
+  local ZwaveDriver = require "st.zwave.driver"
+  local version = require "version"
+
+  if version.api >= 16 then
+    return ZwaveDriver.lazy_load_sub_driver_v2(sub_driver_name)
+  elseif version.api >= 9 then
+    return ZwaveDriver.lazy_load_sub_driver(require(sub_driver_name))
+  else
+    return require(sub_driver_name)
+  end
+
+end
diff --git a/drivers/SmartThings/zwave-window-treatment/src/preferences.lua b/drivers/SmartThings/zwave-window-treatment/src/preferences.lua
index e8854c0bc0..54bad4c0ec 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/preferences.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/preferences.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local devices = {
   QUBINO = {
diff --git a/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/can_handle.lua
new file mode 100644
index 0000000000..12d85394cf
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_springs_window_fashion_shade(opts, driver, device, ...)
+  local FINGERPRINTS = require("springs-window-fashion-shade.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("springs-window-fashion-shade")
+    end
+  end
+  return false
+end
+
+return can_handle_springs_window_fashion_shade
diff --git a/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/fingerprints.lua
new file mode 100644
index 0000000000..7730b633e8
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/fingerprints.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local SPRINGS_WINDOW_FINGERPRINTS = {
+  {mfr = 0x026E, prod = 0x4353, model = 0x5A31}, -- Springs Window Shade
+  {mfr = 0x026E, prod = 0x5253, model = 0x5A31}, -- Springs Roller Shade
+}
+
+return SPRINGS_WINDOW_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/init.lua b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/init.lua
index e501eecdff..2f4d3c38e6 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/springs-window-fashion-shade/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.constants
@@ -18,24 +8,12 @@ local constants = require "st.zwave.constants"
 --- @type st.zwave.CommandClass.SwitchMultilevel
 local SwitchMultilevel = (require "st.zwave.CommandClass.SwitchMultilevel")({version=4})
 
-local SPRINGS_WINDOW_FINGERPRINTS = {
-  {mfr = 0x026E, prod = 0x4353, model = 0x5A31}, -- Springs Window Shade
-  {mfr = 0x026E, prod = 0x5253, model = 0x5A31}, -- Springs Roller Shade
-}
 
 --- Determine whether the passed device is springs window fashion shade
 ---
 --- @param driver st.zwave.Driver
 --- @param device st.zwave.Device
 --- @return boolean true if the device is springs window fashion shade, else false
-local function can_handle_springs_window_fashion_shade(opts, driver, device, ...)
-  for _, fingerprint in ipairs(SPRINGS_WINDOW_FINGERPRINTS) do
-    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function init_handler(self, device)
   -- This device has a preset position set in hardware, so we need to override the base driver
@@ -77,7 +55,7 @@ local springs_window_fashion_shade = {
     }
   },
   NAME = "Springs window fashion shade",
-  can_handle = can_handle_springs_window_fashion_shade,
+  can_handle = require("springs-window-fashion-shade.can_handle"),
 }
 
 return springs_window_fashion_shade
diff --git a/drivers/SmartThings/zwave-window-treatment/src/sub_drivers.lua b/drivers/SmartThings/zwave-window-treatment/src/sub_drivers.lua
new file mode 100644
index 0000000000..6db8853e1a
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/sub_drivers.lua
@@ -0,0 +1,11 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local lazy_load_if_possible = require "lazy_load_subdriver"
+local sub_drivers = {
+   lazy_load_if_possible("springs-window-fashion-shade"),
+   lazy_load_if_possible("iblinds-window-treatment"),
+   lazy_load_if_possible("window-treatment-venetian"),
+   lazy_load_if_possible("aeotec-nano-shutter"),
+}
+return sub_drivers
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
index 9c879806f6..c601ba630f 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
index 5431ed1e70..edaffb4214 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
index c11b578b07..089fc29bac 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local zw = require "st.zwave"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_iblinds_window_treatment.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_iblinds_window_treatment.lua
index f53e540fc4..e2134b1163 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_iblinds_window_treatment.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_iblinds_window_treatment.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_springs_window_treatment.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_springs_window_treatment.lua
index be3b3a6405..843b26e407 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_springs_window_treatment.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_springs_window_treatment.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local constants = require "st.zwave.constants"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_window_treatment.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_window_treatment.lua
index 534f6c56f7..fa6fd809e7 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_window_treatment.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_window_treatment.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/can_handle.lua
new file mode 100644
index 0000000000..f2eb62ad27
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_window_treatment_venetian(opts, driver, device, ...)
+  local FINGERPRINTS = require("window-treatment-venetian.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("window-treatment-venetian")
+    end
+  end
+  return false
+end
+
+return can_handle_window_treatment_venetian
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/can_handle.lua
new file mode 100644
index 0000000000..cc9ca62b1c
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_fibaro_roller_shutter(opts, driver, device, ...)
+  local FINGERPRINTS = require("window-treatment-venetian.fibaro-roller-shutter.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("window-treatment-venetian.fibaro-roller-shutter")
+    end
+  end
+  return false
+end
+
+return can_handle_fibaro_roller_shutter
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/fingerprints.lua
new file mode 100644
index 0000000000..925685157f
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/fingerprints.lua
@@ -0,0 +1,8 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local FIBARO_ROLLER_SHUTTER_FINGERPRINTS = {
+  {mfr = 0x010F, prod = 0x1D01, model = 0x1000}, -- Fibaro Walli Roller Shutter
+}
+
+return FIBARO_ROLLER_SHUTTER_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/init.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/init.lua
index dbdde5b87c..5581e3a5af 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fibaro-roller-shutter/init.lua
@@ -1,25 +1,12 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 --- @type st.zwave.CommandClass
 local cc = (require "st.zwave.CommandClass")
 --- @type st.zwave.CommandClass.Configuration
 local Configuration = (require "st.zwave.CommandClass.Configuration")({version=1})
 
-local FIBARO_ROLLER_SHUTTER_FINGERPRINTS = {
-  {mfr = 0x010F, prod = 0x1D01, model = 0x1000}, -- Fibaro Walli Roller Shutter
-}
 
 -- configuration parameters
 local CALIBRATION_CONFIGURATION = 150
@@ -33,14 +20,6 @@ local CLB_NOT_STARTED = "not_started"
 local CLB_DONE = "done"
 local CLB_PENDING = "pending"
 
-local function can_handle_fibaro_roller_shutter(opts, driver, device, ...)
-  for _, fingerprint in ipairs(FIBARO_ROLLER_SHUTTER_FINGERPRINTS) do
-    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function configuration_report(driver, device, cmd)
   local parameter_number = cmd.args.parameter_number
@@ -79,7 +58,7 @@ local fibaro_roller_shutter = {
     }
   },
   NAME = "fibaro roller shutter",
-  can_handle = can_handle_fibaro_roller_shutter,
+  can_handle = require("window-treatment-venetian.fibaro-roller-shutter.can_handle"),
   lifecycle_handlers = {
     add = device_added
   }
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fingerprints.lua
new file mode 100644
index 0000000000..91dc96c5b8
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/fingerprints.lua
@@ -0,0 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local WINDOW_TREATMENT_VENETIAN_FINGERPRINTS = {
+  {mfr = 0x010F, prod = 0x1D01, model = 0x1000}, -- Fibaro Walli Roller Shutter
+  {mfr = 0x0159, prod = 0x0003, model = 0x0052}, -- Qubino Flush Shutter AC
+  {mfr = 0x0159, prod = 0x0003, model = 0x0053}, -- Qubino Flush Shutter DC
+}
+
+return WINDOW_TREATMENT_VENETIAN_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/init.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/init.lua
index 2ff27250a8..c201ed32eb 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/init.lua
@@ -1,16 +1,7 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
 
 local cc = (require "st.zwave.CommandClass")
 local Basic = (require "st.zwave.CommandClass.Basic")({ version=1 })
@@ -19,20 +10,7 @@ local SwitchMultilevel = (require "st.zwave.CommandClass.SwitchMultilevel")({ver
 local WindowShadeDefaults = require "st.zwave.defaults.windowShade"
 local WindowShadeLevelDefaults = require "st.zwave.defaults.windowShadeLevel"
 
-local WINDOW_TREATMENT_VENETIAN_FINGERPRINTS = {
-  {mfr = 0x010F, prod = 0x1D01, model = 0x1000}, -- Fibaro Walli Roller Shutter
-  {mfr = 0x0159, prod = 0x0003, model = 0x0052}, -- Qubino Flush Shutter AC
-  {mfr = 0x0159, prod = 0x0003, model = 0x0053}, -- Qubino Flush Shutter DC
-}
 
-local function can_handle_window_treatment_venetian(opts, driver, device, ...)
-  for _, fingerprint in ipairs(WINDOW_TREATMENT_VENETIAN_FINGERPRINTS) do
-    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function shade_event_handler(self, device, cmd)
   WindowShadeDefaults.zwave_handlers[cc.SWITCH_MULTILEVEL][SwitchMultilevel.REPORT](self, device, cmd)
@@ -70,14 +48,11 @@ local window_treatment_venetian = {
       [SwitchMultilevel.REPORT] = shade_event_handler
     }
   },
-  can_handle = can_handle_window_treatment_venetian,
+  can_handle = require("window-treatment-venetian.can_handle"),
   lifecycle_handlers = {
     init = map_components
   },
-  sub_drivers = {
-    require("window-treatment-venetian/fibaro-roller-shutter"),
-    require("window-treatment-venetian/qubino-flush-shutter")
-  }
+  sub_drivers = require("window-treatment-venetian.sub_drivers"),
 }
 
 return window_treatment_venetian
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/can_handle.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/can_handle.lua
new file mode 100644
index 0000000000..e601800084
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_qubino_flush_shutter(opts, self, device, ...)
+  local FINGERPRINTS = require("window-treatment-venetian.qubino-flush-shutter.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("window-treatment-venetian.qubino-flush-shutter")
+    end
+  end
+  return false
+end
+
+return can_handle_qubino_flush_shutter
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/fingerprints.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/fingerprints.lua
new file mode 100644
index 0000000000..098879f313
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/fingerprints.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local QUBINO_FLUSH_SHUTTER_FINGERPRINTS = {
+  {mfr = 0x0159, prod = 0x0003, model = 0x0052}, -- Qubino Flush Shutter AC
+  {mfr = 0x0159, prod = 0x0003, model = 0x0053}, -- Qubino Flush Shutter DC
+}
+
+return QUBINO_FLUSH_SHUTTER_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/init.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/init.lua
index fafc6d5026..56ba50f516 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/init.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/qubino-flush-shutter/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
@@ -41,19 +31,7 @@ local SHADE_TARGET = "shade_target"
 local ENERGY_UNIT_KWH = "kWh"
 local POWER_UNIT_WATT = "W"
 
-local QUBINO_FLUSH_SHUTTER_FINGERPRINTS = {
-  {mfr = 0x0159, prod = 0x0003, model = 0x0052}, -- Qubino Flush Shutter AC
-  {mfr = 0x0159, prod = 0x0003, model = 0x0053}, -- Qubino Flush Shutter DC
-}
 
-local function can_handle_qubino_flush_shutter(opts, self, device, ...)
-  for _, fingerprint in ipairs(QUBINO_FLUSH_SHUTTER_FINGERPRINTS) do
-    if device:id_match( fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function configuration_report(self, device, cmd)
   local parameter_number = cmd.args.parameter_number
@@ -190,7 +168,7 @@ local qubino_flush_shutter = {
       [capabilities.windowShade.commands.close.NAME] = close
     },
   },
-  can_handle = can_handle_qubino_flush_shutter,
+  can_handle = require("window-treatment-venetian.qubino-flush-shutter.can_handle"),
   lifecycle_handlers = {
     added = device_added,
     infoChanged = info_changed
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/sub_drivers.lua b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/sub_drivers.lua
new file mode 100644
index 0000000000..41600cffef
--- /dev/null
+++ b/drivers/SmartThings/zwave-window-treatment/src/window-treatment-venetian/sub_drivers.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local lazy_load_if_possible = require "lazy_load_subdriver"
+local sub_drivers = {
+   lazy_load_if_possible("window-treatment-venetian/fibaro-roller-shutter"),
+   lazy_load_if_possible("window-treatment-venetian/qubino-flush-shutter"),
+}
+return sub_drivers
diff --git a/drivers/SmartThings/zwave-window-treatment/src/window_preset_defaults.lua b/drivers/SmartThings/zwave-window-treatment/src/window_preset_defaults.lua
index 5046940dea..3d5056abc5 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/window_preset_defaults.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/window_preset_defaults.lua
@@ -1,16 +1,6 @@
--- Copyright 2025 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 
 -- These were added to scripting engine, but this file is to make sure drivers
@@ -62,4 +52,4 @@ defaults.window_shade_preset_cmd = function(driver, device, command)
   device.thread:call_with_delay(constants.MIN_DIMMING_GET_STATUS_DELAY, query_device)
 end
 
-return defaults
\ No newline at end of file
+return defaults