diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3085aca..a7bde38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -90,7 +90,7 @@ jobs:
 
       - name: Upload Test Results Artifacts
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.cfengine }}
           path: |
@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload Debugging Info To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Failure Debugging Info - ${{ matrix.cfengine }}
           path: |
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8db6ad3..8bd386d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Upload Debugging Info To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Failure Debugging Info - ${{ matrix.cfengine }}
           path: |
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
index e2c878c..b9e2a69 100644
--- a/ModuleConfig.cfc
+++ b/ModuleConfig.cfc
@@ -34,16 +34,7 @@ component {
              * The default folder name where your cbwire components are stored.
              * Defaults to 'wires' folder.
              */
-            "componentLocation" : "wires",
-            /**
-             * Determines if Turbo should be enabled
-             */
-            "enableTurbo" : false,
-            /**
-             * Caching for single-file components to speed up response time.
-             * Should be false for local development.
-             */
-            "cacheSingleFileComponents": false,
+            "wiresLocation" : "wires",
             /**
              * Trims string properties if set to true
              */
diff --git a/handlers/Main.cfc b/handlers/Main.cfc
index 0a79f34..c605179 100644
--- a/handlers/Main.cfc
+++ b/handlers/Main.cfc
@@ -8,7 +8,17 @@ component {
      * URI: /cbwire/update
      */
     function index( event, rc, prc ){
-        return cbwireController.handleRequest( getHTTPRequestData(), arguments.event );
+        try {
+            return cbwireController.handleRequest( getHTTPRequestData(), arguments.event );
+        } catch ( any e ) {
+            if ( e.message contains "Page expired" ) {
+                event.noLayout();
+                event.setView( view="errors/pageExpired", module="cbwire" );
+                event.setHTTPHeader( statusCode="419", statusText="Page Expired" );
+            } else {
+                rethrow;
+            }
+        }
     }
 
     /**
diff --git a/interceptors/CBWIRE.cfc b/interceptors/CBWIRE.cfc
index edc29ee..5f5011e 100644
--- a/interceptors/CBWIRE.cfc
+++ b/interceptors/CBWIRE.cfc
@@ -1,14 +1,21 @@
 component {
 
     /**
-     * Ensures that no other custom interceptors run for the cbwire module.
-     * Returns true to break the interceptor chain.
-     *
-     * @return boolean
+     * Returns the module settings.
+     * 
+     * @return struct
      */
-    function afterAspectsLoad() {
-        variables.CBWIREController = getInstance( dsl="CBWIREController@cbwire");
-        variables.settings = getInstance( dsl="coldbox:modulesettings:cbwire" ); 
+    function getSettings() {
+        return getInstance( "coldbox:modulesettings:cbwire" );
+    }
+
+    /**
+     * Returns the CBWIRE controller.
+     * 
+     * @return CBWIREController
+     */
+    function getCBWIREController() {
+        return getInstance( "CBWIREController@cbwire" );
     }
 
     /** 
@@ -17,7 +24,8 @@ component {
      * @return void
      */
     function preReinit() {
-        local.tmpDirectory = variables.settings.moduleRootPath & "/models/tmp";
+        local.settings = getSettings();
+        local.tmpDirectory = local.settings.moduleRootPath & "/models/tmp";
 
         if ( directoryExists( local.tmpDirectory ) ) {
             directoryDelete( local.tmpDirectory, true );
@@ -69,9 +77,8 @@ component {
                 data = "",
                 statusCode = 400
             ).noExecution();
-            // Returning true breaks further interceptors execution.
-            return true;
         }
+        return true;
     }
 
     function preEvent() eventPattern="^cbwire.*" {
@@ -123,9 +130,10 @@ component {
     }
 
     function postLayoutRender() {
-        if ( shouldInject( arguments.event ) ) {
+        if ( shouldInject( arguments.event ) && !request.keyExists( "_cbwire_injected_assets" ) ) {
             arguments.data.renderedLayout = replaceNoCase( arguments.data.renderedLayout, "</head>", getStyles() & chr( 10 ) & "</head>", "one" );
             arguments.data.renderedLayout = replaceNoCase( arguments.data.renderedLayout, "</body>", getScripts() & chr( 10 ) & "</body>", "one" );
+            request._cbwire_injected_assets = true;
         }
     }
 
@@ -172,7 +180,7 @@ component {
      * @return string
      */
     private function getStyles() {
-        return variables.CBWIREController.getStyles();
+        return getCBWIREController().getStyles();
     }
 
     /** 
@@ -181,7 +189,7 @@ component {
      * @return string
      */
     private function getScripts() {
-        return variables.CBWIREController.getScripts();
+        return getCBWIREController().getScripts();
     }
 
     /**
@@ -192,6 +200,7 @@ component {
      * @return boolean
      */
     private function shouldInject( event ) {
-        return arguments.event.getCurrentModule() != "cbwire" && variables.settings.autoInjectAssets == true;
+        local.settings = getSettings();
+        return arguments.event.getCurrentModule() != "cbwire" && local.settings.autoInjectAssets == true;
     }
 }
\ No newline at end of file
diff --git a/models/CBWIREController.cfc b/models/CBWIREController.cfc
index cc91aa2..9bca55c 100644
--- a/models/CBWIREController.cfc
+++ b/models/CBWIREController.cfc
@@ -12,12 +12,17 @@ component singleton {
     // Inject module settings
     property name="moduleSettings" inject="coldbox:modulesettings:cbwire";
     
-	// Inject module service
-	property name="moduleService" inject="coldbox:moduleService";
+    // Inject module service
+    property name="moduleService" inject="coldbox:moduleService";
 
     // Inject SingleFileComponentBuilder
     property name="singleFileComponentBuilder" inject="SingleFileComponentBuilder@cbwire";
 
+    function init() {
+        // Initialize the array to store single file components
+        variables._singleFileComponents = [];
+        return this;
+    }
     /**
      * Instantiates a CBWIRE component, mounts it,
      * and then calls its internal renderIt() method.
@@ -32,6 +37,7 @@ component singleton {
      */
     function wire(required name, params = {}, key = "", lazy = false, lazyIsolated = true ) {
         local.instance = createInstance(argumentCollection=arguments)
+                ._withPath( arguments.name )
                 ._withEvent( getEvent() )
                 ._withParams( arguments.params, arguments.lazy )
                 ._withKey( arguments.key );
@@ -59,8 +65,7 @@ component singleton {
         local.csrfTokenVerified = variables.wirebox.getInstance( dsl="@cbcsrf" ).verify( local.csrfToken );
         // Check the CSRF token, throw 403 if invalid
         if( !local.csrfTokenVerified ){
-            cfheader( statusCode="403", statusText="Forbidden" ); 
-            throw( type="CBWIREException", message="Invalid CSRF token." );
+            throw( type="CBWIREException", message="Page expired." );
         }
         // Perform additional deserialization of the component snapshots
         local.payload.components = local.payload.components.map( function( _comp ) {
@@ -74,6 +79,7 @@ component singleton {
                 local.componentInstance = createInstance( _componentPayload.snapshot.memo.name );
                 // Return the response for this component
                 return local.componentInstance
+                            ._withPath( _componentPayload.snapshot.memo.name )
                             ._withEvent( event )
                             ._withIncomingPayload( _componentPayload )
                             ._getHTTPResponse( _componentPayload );
@@ -173,19 +179,26 @@ component singleton {
             local.fullComponentPath = "wires." & local.fullComponentPath;
         }
         
-		if ( find( "@", local.fullComponentPath ) ) {
-			// This is a module reference, find in our module
-			var params = listToArray( local.fullComponentPath, "@" );
-			if ( params.len() != 2 ) {
-				throw( type="ModuleNotFound", message = "CBWIRE cannot locate the module or component using '" & local.fullComponentPath & "'." );
-			}
+        if ( find( "@", local.fullComponentPath ) ) {
+            // This is a module reference, find in our module
+            var params = listToArray( local.fullComponentPath, "@" );
+            if ( params.len() != 2 ) {
+                throw( type="ModuleNotFound", message = "CBWIRE cannot locate the module or component using '" & local.fullComponentPath & "'." );
+            }
             // modify local.fullComponentPath to full path for module
             local.fullComponentPath = getModuleComponentPath( params[ 1 ], params[ 2 ] );
-		}
+        }
 
         try {
+            // Check if we've already flagged this component as a single file component
+            // This is to improve performance by not attempting to create the component again
+            if ( variables._singleFileComponents.contains( arguments.name ) ) {
+                throw( type="Injector.InstanceNotFoundException", message="Component '#arguments.name#' is a single file component." );
+            }
             // Attempt to create an instance of the component
-            return variables.wirebox.getInstance(local.fullComponentPath);
+            local.componentInstance = variables.wirebox.getInstance(local.fullComponentPath)
+                ._withPath( arguments.name );
+            return local.componentInstance;
         } catch( Injector.InstanceNotFoundException e ) {
             local.singleFileComponent = variables.singleFileComponentBuilder
                 .setInitialRender( true )
@@ -196,6 +209,7 @@ component singleton {
                 abort;
                 rethrow;
             }
+            variables._singleFileComponents.append( arguments.name );
 
             return local.singleFileComponent;
         } catch (Any e) {
@@ -206,24 +220,56 @@ component singleton {
         }
     }
 
-	/**
-	 * Returns the full dot notation path to a modules component.
-	 *
-	 * @path String | Name of the cbwire component.
-	 * @module String | Name of the module to look for wire in.
-	 */
-	private function getModuleComponentPath( path, module ) {
-		var moduleConfig = moduleService.getModuleConfigCache();
-		if ( !moduleConfig.keyExists( module ) ) {
-			throw( type="ModuleNotFound", message = "CBWIRE cannot locate the module '" & arguments.module & "'.")
-		}
-
-		// if there is a dot in the path, then we are referencing a folder within a module otherwise use the default wire location.
-		var moduleRegistry = moduleService.getModuleRegistry();
-		return arguments.path contains "." ?
-			moduleRegistry[ module ].invocationPath & "." & module & "." & arguments.path :
-			moduleRegistry[ module ].invocationPath & "." & module & "." & getWiresLocation() & "." & arguments.path;
-	}
+    /** 
+    * Returns the path to the modules folder.
+    * 
+    * @module string | The name of the module.
+    *
+    * @return string
+    */
+    function getModuleRootPath( module ) {
+        var moduleRegistry = moduleService.getModuleRegistry();
+
+        if ( moduleRegistry.keyExists( module ) ) {
+            return moduleRegistry[ module ].invocationPath & "." & module;
+        }
+
+        throw( type="ModuleNotFound", message = "CBWIRE cannot locate the module '" & arguments.module & "'.")
+    }
+
+    /**
+     * Returns the full dot notation path to a modules component.
+     *
+     * @path String | Name of the cbwire component.
+     * @module String | Name of the module to look for wire in.
+     */
+    function getModuleComponentPath( path, module ) {
+        var moduleConfig = moduleService.getModuleConfigCache();
+        if ( !moduleConfig.keyExists( module ) ) {
+            throw( type="ModuleNotFound", message = "CBWIRE cannot locate the module '" & arguments.module & "'.")
+        }
+
+        // if there is a dot in the path, then we are referencing a folder within a module otherwise use the default wire location.
+        var moduleRegistry = moduleService.getModuleRegistry();
+
+        var result = arguments.path contains "." ?
+            moduleRegistry[ module ].invocationPath & "." & module & "." & arguments.path :
+            moduleRegistry[ module ].invocationPath & "." & module & "." & getWiresLocation() & "." & arguments.path;
+
+        return result;
+    }
+
+    /**
+     * Returns the path to the wires folder within a module path.
+     *
+     * @module string | The name of the module.
+     * 
+     * @return string 
+     */
+    function getModuleWiresPath( module ) {
+        local.moduleRegistry = moduleService.getModuleRegistry();
+        return arguments
+    }
 
     /**
      * Returns the ColdBox RequestContext object.
@@ -442,4 +488,13 @@ component singleton {
         return requestService.getController().getRenderer().view( argumentCollection=arguments );
     }
 
+    /**
+     * Returns the URI endpoint for updating CBWIRE components.
+     * 
+     * @return string
+     */
+    function getUpdateEndpoint() {
+        var settings = variables.moduleSettings;        
+        return settings.keyExists( "updateEndpoint") && settings.updateEndpoint.len() ? settings.updateEndpoint : "/cbwire/update";
+    }
 }
\ No newline at end of file
diff --git a/models/Component.cfc b/models/Component.cfc
index 82a0e95..d251575 100644
--- a/models/Component.cfc
+++ b/models/Component.cfc
@@ -1,5 +1,7 @@
 component output="true" {
 
+    property name="_globalSettings" inject="coldbox:modulesettings:cbwire";
+
     property name="_CBWIREController" inject="CBWIREController@cbwire";
 
     property name="_wirebox" inject="wirebox";
@@ -24,6 +26,9 @@ component output="true" {
     property name="_returnValues";
     property name="_redirect";
     property name="_redirectUsingNavigate";
+    property name="_isolate";
+    property name="_path";
+    property name="_renderedContent";
 
     /**
      * Constructor
@@ -58,6 +63,8 @@ component output="true" {
         variables._returnValues = [];
         variables._redirect = "";
         variables._redirectUsingNavigate = false;
+        variables._isolate = false;
+        variables._renderedContent = "";
         
         /* 
             Cache the component's meta data on initialization
@@ -80,6 +87,11 @@ component output="true" {
         */
         _prepareGeneratedGettersAndSetters();
 
+        /*
+            Prep isolation
+        */
+        _prepareIsolation();
+
         /* 
             Prep for lazy loading
         */
@@ -305,15 +317,27 @@ component output="true" {
         }
         // Instaniate this child component as a new component
         local.instance = variables._CBWIREController.createInstance(argumentCollection=arguments)
-                ._withParent( this )
-                ._withEvent( variables._event )
-                ._withParams( arguments.params, arguments.lazy )
-                ._withKey( arguments.key )
-                ._withLazy( arguments.lazy );
+            ._withPath( arguments.name )
+            ._withParent( this )
+            ._withEvent( variables._event )
+            ._withParams( arguments.params, arguments.lazy )
+            ._withKey( arguments.key )
+            ._withLazy( arguments.lazy );
 
         // Check if lazy loading is enabled
         if ( arguments.lazy ) {
-            return local.instance._generateXIntersectLazyLoadSnapshot( params=arguments.params );
+            local.lazyRendering = local.instance._generateXIntersectLazyLoadSnapshot( params=arguments.params );
+            // Based on the rendering, determine our outer component tag
+            local.componentTag = _getComponentTag( local.lazyRendering );
+            // Track the rendered child
+            variables._children.append( [
+                "#arguments.key#": [
+                    local.componentTag,
+                    local.instance._getId()
+                ]
+            ] );
+
+            return local.lazyRendering;
         } else {
             // Render it out normally
             local.rendering = local.instance._render();
@@ -556,10 +580,21 @@ component output="true" {
     }
 
     /**
-     * Passes the current event into our component.
+     * Passes the path of the component.
+     *
+     * @path string | The path of the component.
      * 
      * @return Component
+     */
+    function _withPath( path ) {
+        variables._path = arguments.path;
+        return this;
+    }
+
+    /**
+     * Passes the current event into our component.
      * 
+     * @return Component
      */
     function _withEvent( event ) {
         variables._event = arguments.event;
@@ -634,6 +669,7 @@ component output="true" {
      */
     function _withLazy( lazy ) {
         variables._lazyLoad = arguments.lazy;
+        variables._isolate = true;
         return this;
     }
 
@@ -705,10 +741,19 @@ component output="true" {
      * @return void
      */
     function _applyUpdates( updates ) {
+        if ( !updates.count() ) return;
+        // Capture old values 
+        local.oldValues = duplicate( data );
         // Array to track which array props were updated
         local.updatedArrayProps = [];
         // Loop over the updates and apply them
         arguments.updates.each( function( key, value ) {
+
+            // Check if we should trim if simple value
+            if ( isSimpleValue( arguments.value ) && shouldTrimStringValues() ) {
+                arguments.value = trim( arguments.value );
+            }
+
             // Determine if this is an array update
             if ( reFindNoCase( "\.[0-9]+", arguments.key ) ) {
                 local.regexMatch = reFindNoCase( "(.+)\.([0-9]+)", arguments.key, 1, true );
@@ -720,7 +765,11 @@ component output="true" {
                     updatedArrayProps.append( local.propertyName );
                 }
             } else {
-                variables.data[ key ] = value;
+                local.oldValue = variables.data[ key ];
+                variables.data[ key ] = arguments.value;
+                if ( structKeyExists( this, "onUpdate#key#") ) {
+                    invoke( this, "onUpdate#key#", { value: arguments.value, oldValue: local.oldValue });
+                }
             }
         } );
         
@@ -729,6 +778,11 @@ component output="true" {
                 return arguments.value != "__rm__";
             } );
         } );
+
+        // Call onUpdate passing newValues and oldValues
+        if ( structKeyExists( this, "onUpdate" ) ) {
+            invoke( this, "onUpdate", { newValues: duplicate( variables.data ), oldValues: local.oldValues } );
+        }
     }
 
     /**
@@ -809,7 +863,7 @@ component output="true" {
             local.normalizedPath &= ".cfm";
         }
         // Ensure the path starts with "/wires/" without duplicating it
-        if (left(local.normalizedPath, 6) != "wires/") {
+        if (!isModulePath() && left(local.normalizedPath, 6) != "wires/") {
             local.normalizedPath = "wires/" & local.normalizedPath;
         }
         // Prepend a leading slash if not present
@@ -952,8 +1006,17 @@ component output="true" {
         local.wireAttributes = 'wire:snapshot="' & arguments.snapshotEncoded & '" wire:effects="#_generateWireEffectsAttribute()#" wire:id="#variables._id#"';
         // Determine our outer element 
         local.outerElement = _getOuterElement( arguments.html );
+        // Find the position of the opening tag
+        local.openingTagStart = findNoCase("<" & local.outerElement, arguments.html);
+        local.openingTagEnd = find(">", arguments.html, local.openingTagStart);
         // Insert attributes into the opening tag
-        return arguments.html.reReplaceNoCase( "<" & local.outerElement & "\s*", "<" & local.outerElement & " " & local.wireAttributes & " ", "one" );
+        if (local.openingTagStart > 0 && local.openingTagEnd > 0) {
+            local.openingTag = mid(arguments.html, local.openingTagStart, local.openingTagEnd - local.openingTagStart + 1);
+            local.newOpeningTag = replace(local.openingTag, "<" & local.outerElement, "<" & local.outerElement & " " & local.wireAttributes, "one");
+            arguments.html = replace(arguments.html, local.openingTag, local.newOpeningTag, "one");
+        }
+        
+        return arguments.html;
     }
 
     /**
@@ -1010,17 +1073,20 @@ component output="true" {
      * @return The rendered content of the view template.
      */
     function _renderViewContent( normalizedPath, params = {} ){
-        // Render our view using an renderer encapsulator
-        savecontent variable="local.viewContent" {
-            cfmodule(
-                template = "RendererEncapsulator.cfm",
-                cbwireComponent = this,
-                normalizedPath = arguments.normalizedPath,
-                params = arguments.params
-            );
+        if ( !variables._renderedContent.len() ) {
+            // Render our view using an renderer encapsulator
+            savecontent variable="local.viewContent" {
+                cfmodule(
+                    template = "RendererEncapsulator.cfm",
+                    cbwireComponent = this,
+                    normalizedPath = arguments.normalizedPath,
+                    params = arguments.params
+                );
+            }
+            variables._renderedContent = local.viewContent;
         }
 
-        return local.viewContent;
+        return variables._renderedContent;
     }
 
     /**
@@ -1110,23 +1176,32 @@ component output="true" {
         };
 
         // Prepend any passed in params into our forMount array
-
         arguments.params.each( function( key, value ) {
             snapshot.data.forMount.prepend( { "#arguments.key#": arguments.value } );
         } );
 
         // Serialize the snapshot to JSON and then encode it for HTML attribute inclusion
-        var lazyLoadSnapshot = serializeJson(local.snapshot);
+        local.lazyLoadSnapshot = serializeJson( local.snapshot );
     
         // Generate the base64 encoded version of the serialized snapshot for use in x-intersect
-        var base64EncodedSnapshot = toBase64(lazyLoadSnapshot);   
+        local.base64EncodedSnapshot = toBase64( local.lazyLoadSnapshot );   
 
-        // Build the final <div> element with appropriate attributes
-        var lazyLoadDiv = '<div wire:snapshot="' & _encodeAttribute( serializeJson( _getSnapshot() ) ) & '" ' &
-                          'wire:effects="#_generateWireEffectsAttribute()#" wire:id="#variables._id#" ' &
-                          'x-intersect="$wire._lazyMount(&##039;' & base64EncodedSnapshot & '&##039;)">#placeHolder()#</div>';
-    
-        return lazyLoadDiv;
+        // Get our placeholder html
+        local.html = placeholder();
+
+        // Check if placeholder is even defined, if not throw error
+        if ( isNull( local.html ) || !local.html.len() ) {
+            throw( type="CBWIREException", message="The placeholder method must be defined for lazy loaded components and it must have the same outer element as your CBWIRE template." );
+        }
+
+        // Define the wire attributes to append
+        local.wireAttributes = 'wire:snapshot="' & _encodeAttribute( serializeJson( _getSnapshot() ) ) & '" wire:effects="#_generateWireEffectsAttribute()#" wire:id="#variables._id#"' & ' x-intersect="$wire._lazyMount(&##039;' & local.base64EncodedSnapshot & '&##039;)"';
+
+        // Determine our outer element
+        local.outerElement = _getOuterElement( local.html );
+
+        // Insert attributes into the opening tag
+        return local.html.reReplaceNoCase( "<" & local.outerElement & "\s*", "<" & local.outerElement & " " & local.wireAttributes & " ", "one" );
     }
 
     /**
@@ -1138,7 +1213,6 @@ component output="true" {
      * @return struct
      */
     function _getHTTPResponse( componentPayload ){
-
         // Hydrate the component
         _hydrate( arguments.componentPayload );
         // Apply any updates
@@ -1321,6 +1395,17 @@ component output="true" {
         } );
     }
 
+    /**
+     * Prepares the component for isolation.
+     * 
+     * @return void
+     */
+    function _prepareIsolation() {
+        // If the component has an isolate method, call it
+        variables._isolate = variables.keyExists( "isolate" ) && isBoolean( variables.isolate ) && variables.isolate ? 
+            true : false;
+    }
+
     /**
      * Prepares the component for lazy loading.
      * 
@@ -1330,6 +1415,10 @@ component output="true" {
         // If the component has a lazyLoad method, call it
         variables._lazyLoad = variables.keyExists( "lazyLoad" ) && isBoolean( variables.lazyLoad ) && variables.lazyLoad ? 
             true : false;
+
+        if ( variables._lazyLoad ) {
+            variables._isolate = true;
+        }
     }
 
     /**
@@ -1360,7 +1449,21 @@ component output="true" {
      * Returns the path to the view template file.
      */
     function _getViewPath(){
-        return "wires." & _getComponentName();
+        if ( isModulePath() ) {
+            var moduleRoot = variables._CBWIREController.getModuleRootPath( _getModuleName() );
+            return moduleRoot & ".wires." & _getComponentName().listFirst( "@" );
+        }
+
+        return "wires." & variables._path;
+    }
+
+    /**
+     * Returns the module name.
+     * 
+     * @return string
+     */
+    function _getModuleName() {
+        return variables._path contains "@" ? variables._path.listLast( "@" ) : "";
     }
 
     /**
@@ -1385,15 +1488,15 @@ component output="true" {
      * @return struct
      */
     function _getMemo(){
-        var name = _getComponentName();
         return [
             "id": variables._id,
-            "name":name,
-            "path":name,
+            "name": _getComponentName(),
+            "path": _getComponentName(),
             "method":"GET",
             "children": variables._children.count() ? variables._children : [],
             "scripts":[],
             "assets":[],
+            "isolate": variables._isolate,
             "lazyLoaded": false,
             "lazyIsolated": true,
             "errors":[],
@@ -1411,7 +1514,8 @@ component output="true" {
         if ( variables._metaData.name contains "cbwire.models.tmp." ) {
             return variables._metaData.name.replaceNoCase( "cbwire.models.tmp.", "", "one" );
         }
-        return variables._metaData.name.replaceNoCase( "wires.", "", "one" );
+        // only returns the last part of the name seprate by dots
+        return variables._path;
     }
 
     /**
@@ -1510,6 +1614,15 @@ component output="true" {
         return local.outerElement.trim();
     }
 
+    /**
+     * Returns true if the path contains a module.
+     * 
+     * @return boolean
+     */
+    function isModulePath() {
+        return variables._path contains "@";
+    }
+
     /**
      * Returns true if the cbvalidation module is installed.
      * 
@@ -1523,4 +1636,16 @@ component output="true" {
             return false;
         }
     }
+
+    /**
+     * Returns true if trimStringValues is enabled, either globally
+     * or for the component.
+     * 
+     * @return boolean
+     */
+    function shouldTrimStringValues() {
+        return 
+            ( _globalSettings.keyExists( "trimStringValues" ) && _globalSettings.trimStringValues == true ) ||
+            ( variables.keyExists( "trimStringValues" ) && variables.trimStringValues == true );
+    }
 }
diff --git a/models/RendererEncapsulator.cfm b/models/RendererEncapsulator.cfm
index 923af3e..7cdc887 100644
--- a/models/RendererEncapsulator.cfm
+++ b/models/RendererEncapsulator.cfm
@@ -1,7 +1,6 @@
 <cfscript>
 
     function fileIsOutdated(sourcePath, cachePath) {
-        return true;
         return getFileInfo(sourcePath).lastModified > getFileInfo(cachePath).lastModified;
     }
 
diff --git a/models/SingleFileComponentBuilder.cfc b/models/SingleFileComponentBuilder.cfc
index f809f9c..eacfe4d 100644
--- a/models/SingleFileComponentBuilder.cfc
+++ b/models/SingleFileComponentBuilder.cfc
@@ -93,12 +93,6 @@ component accessors="true" singleton {
                 return { "tempComponentName" : "#arguments.componentName#" };
             }
         }
-        
-        // if ( structKeyExists( settings, "cacheSingleFileComponents" ) && settings.cacheSingleFileComponents ) {
-        // 	if ( fileExists( local.tmpCFCPath ) && fileExists( local.tmpCFMPath ) ) {
-        // 		return { "tempComponentName" : "#arguments.componentName#" };
-        // 	}
-        // }
 
         if ( !directoryExists( local.tmpDirectory ) ) {
             directoryCreate( local.tmpDirectory );
diff --git a/models/scripts.cfm b/models/scripts.cfm
index ad1ecb7..de98943 100644
--- a/models/scripts.cfm
+++ b/models/scripts.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 <!-- CBWIRE SCRIPTS -->
-<script src="#getEvent().getModuleRoot( 'cbwire' )#/includes/js/livewire.js?id=239a5c52" data-csrf="#generateCSRFToken()#" data-update-uri="/cbwire/update" data-navigate-once="true"></script>
+<script src="#getEvent().getModuleRoot( 'cbwire' )#/includes/js/livewire.js?id=239a5c52" data-csrf="#generateCSRFToken()#" data-update-uri="#getUpdateEndpoint()#" data-navigate-once="true"></script>
 
 <script data-navigate-once="true">
     document.addEventListener('livewire:init', () => {
diff --git a/test-harness/config/Coldbox.cfc b/test-harness/config/Coldbox.cfc
index bfc7305..05df324 100644
--- a/test-harness/config/Coldbox.cfc
+++ b/test-harness/config/Coldbox.cfc
@@ -11,7 +11,9 @@ component{
 			//Development Settings
 			reinitPassword			= "",
 			handlersIndexAutoReload = true,
-			modulesExternalLocation = [],
+			modulesExternalLocation = [
+				"/modules_external"
+			],
 
 			//Implicit Events
 			defaultEvent			= "main.index",
@@ -79,9 +81,7 @@ component{
 
 		moduleSettings = {
 			"cbwire" = {
-				"autoInjectAssets"		: true,
-				"enableTurbo"			: true,
-				"cacheSingleFileComponents": false
+				"autoInjectAssets"		: true
 			},
 			"cbi18n": {
 				// The default resource to load and aliased as `default`
diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm
index 268e44f..a6f3ff2 100644
--- a/test-harness/layouts/Main.cfm
+++ b/test-harness/layouts/Main.cfm
@@ -1,4 +1,5 @@
-<!DOCTYPE html>
+<cfoutput>
+<!DOCTYPE html>
 <html>
 <head>
 	<title>CBWIRE 4</title>
@@ -7,5 +8,8 @@
 	<header>
 		<h1>Welcome to CBWIRE 4</h1>
 	</header>
+
+	#wire( name="Counter", lazy=true )#
 </body>
-</html>
\ No newline at end of file
+</html>
+</cfoutput>
\ No newline at end of file
diff --git a/test-harness/modules_external/ExternalModule/ModuleConfig.cfc b/test-harness/modules_external/ExternalModule/ModuleConfig.cfc
new file mode 100755
index 0000000..d6841ec
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/ModuleConfig.cfc
@@ -0,0 +1,101 @@
+/**
+ * Module Directives as public properties
+ *
+ * this.title 				= "Title of the module";
+ * this.author 			= "Author of the module";
+ * this.webURL 			= "Web URL for docs purposes";
+ * this.description 		= "Module description";
+ * this.version 			= "Module Version";
+ * this.viewParentLookup   = (true) [boolean] (Optional) // If true, checks for views in the parent first, then it the module.If false, then modules first, then parent.
+ * this.layoutParentLookup = (true) [boolean] (Optional) // If true, checks for layouts in the parent first, then it the module.If false, then modules first, then parent.
+ * this.entryPoint  		= "" (Optional) // If set, this is the default event (ex:forgebox:manager.index) or default route (/forgebox) the framework will use to create an entry link to the module. Similar to a default event.
+ * this.cfmapping			= "The CF mapping to create";
+ * this.modelNamespace		= "The namespace to use for registered models, if blank it uses the name of the module."
+ * this.dependencies 		= "The array of dependencies for this module"
+ *
+ * structures to create for configuration
+ * - parentSettings : struct (will append and override parent)
+ * - settings : struct
+ * - interceptorSettings : struct of the following keys ATM
+ * 	- customInterceptionPoints : string list of custom interception points
+ * - interceptors : array
+ * - layoutSettings : struct (will allow to define a defaultLayout for the module)
+ * - wirebox : The wirebox DSL to load and use
+ *
+ * Available objects in variable scope
+ * - controller
+ * - appMapping (application mapping)
+ * - moduleMapping (include,cf path)
+ * - modulePath (absolute path)
+ * - log (A pre-configured logBox logger object for this object)
+ * - binder (The wirebox configuration binder)
+ * - wirebox (The wirebox injector)
+ *
+ * Required Methods
+ * - configure() : The method ColdBox calls to configure the module.
+ *
+ * Optional Methods
+ * - onLoad() 		: If found, it is fired once the module is fully loaded
+ * - onUnload() 	: If found, it is fired once the module is unloaded
+ **/
+component {
+
+	// Module Properties
+	this.title              = "ExternalModule";
+	this.author             = "";
+	this.webURL             = "";
+	this.description        = "";
+	this.version            = "1.0.0";
+	// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
+	this.viewParentLookup   = true;
+	// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
+	this.layoutParentLookup = true;
+	// Module Entry Point
+	this.entryPoint         = "ExternalModule";
+	// Inherit Entry Point
+	this.inheritEntryPoint  = false;
+	// Model Namespace
+	this.modelNamespace     = "ExternalModule";
+	// CF Mapping
+	this.cfmapping          = "";
+	// Auto-map models
+	this.autoMapModels      = true;
+	// Module Dependencies
+	this.dependencies       =   [];
+
+	/**
+	 * Configure the module
+	 */
+	function configure(){
+		// parent settings
+		parentSettings = {};
+
+		// module settings - stored in modules.name.settings
+		settings = {};
+
+		// Layout Settings
+		layoutSettings = { defaultLayout : "" };
+
+		// Custom Declared Points
+		interceptorSettings = { customInterceptionPoints : [] };
+
+		// Custom Declared Interceptors
+		interceptors = [];
+
+		// Binder Mappings
+		// binder.map("Alias").to("#moduleMapping#.models.MyService");
+	}
+
+	/**
+	 * Fired when the module is registered and activated.
+	 */
+	function onLoad(){
+	}
+
+	/**
+	 * Fired when the module is unregistered and unloaded
+	 */
+	function onUnload(){
+	}
+
+}
diff --git a/test-harness/modules_external/ExternalModule/config/Router.cfc b/test-harness/modules_external/ExternalModule/config/Router.cfc
new file mode 100755
index 0000000..9435672
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/config/Router.cfc
@@ -0,0 +1,13 @@
+/**
+ * Module Router
+ * https://coldbox.ortusbooks.com/the-basics/routing/routing-dsl
+ */
+component{
+
+	function configure(){
+
+		route( "/", "Home.index" );
+
+	}
+
+}
diff --git a/test-harness/modules_external/ExternalModule/config/Scheduler.cfc b/test-harness/modules_external/ExternalModule/config/Scheduler.cfc
new file mode 100755
index 0000000..6cecf91
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/config/Scheduler.cfc
@@ -0,0 +1,21 @@
+/**
+ * Module Task Scheduler
+ * https://coldbox.ortusbooks.com/digging-deeper/scheduled-tasks
+ */
+component {
+
+	function configure(){
+
+		/* task( "photoNumbers" )
+			.call( () => {
+				var random = getInstance( "PhotoService" ).getRandom();
+				writeDump( var="xxxxxxx> Photo numbers: #random#", output="console" );
+				return random;
+			} )
+			.every( 15, "seconds" )
+			.delay( 60, "seconds" )
+			.onEnvironment( "development" ); */
+
+	}
+
+}
diff --git a/test-harness/modules_external/ExternalModule/handlers/Home.cfc b/test-harness/modules_external/ExternalModule/handlers/Home.cfc
new file mode 100755
index 0000000..3b21a1d
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/handlers/Home.cfc
@@ -0,0 +1,13 @@
+/**
+ * The main module handler
+ */
+component{
+
+	/**
+	 * Module EntryPoint
+	 */
+	function index( event, rc, prc ){
+		event.setView( "home/index" );
+	}
+
+}
diff --git a/test-harness/modules_external/ExternalModule/views/home/index.cfm b/test-harness/modules_external/ExternalModule/views/home/index.cfm
new file mode 100755
index 0000000..51b150f
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/views/home/index.cfm
@@ -0,0 +1,3 @@
+<cfoutput>
+<h1>Welcome to my cool module page!</h1>
+</cfoutput>
diff --git a/test-harness/modules_external/ExternalModule/wires/should_load_external_modules.cfm b/test-harness/modules_external/ExternalModule/wires/should_load_external_modules.cfm
new file mode 100644
index 0000000..9e3bbab
--- /dev/null
+++ b/test-harness/modules_external/ExternalModule/wires/should_load_external_modules.cfm
@@ -0,0 +1,11 @@
+<cfoutput>
+    <div>
+        <h1>External Module Loaded</h1>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire 
+
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/tests/specs/CBWIRESpec.cfc b/test-harness/tests/specs/CBWIRESpec.cfc
index 459084c..05bc9ed 100644
--- a/test-harness/tests/specs/CBWIRESpec.cfc
+++ b/test-harness/tests/specs/CBWIRESpec.cfc
@@ -2,6 +2,46 @@ component extends="coldbox.system.testing.BaseTestCase" {
 
     // Lifecycle methods and BDD suites as before...
     function run(testResults, testBox) {
+
+        describe( "Layout", function() {
+
+            it( "should auto inject assets", function() {
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                settings.autoInjectAssets = true;
+                var event = this.get( "main.index" );
+                var html = event.getRenderedContent();
+                expect( html ).toInclude( "<!-- CBWIRE Styles -->" );
+                expect( html ).toInclude( "<!-- CBWIRE Scripts -->" );
+                expect( reMatchNoCase( "CBWIRE Styles", html ).len() ).toBe( 1 );
+                expect( reMatchNoCase( "CBWIRE Scripts", html ).len() ).toBe( 1 );
+            } );
+
+            it( "should not auto inject assets", function() {
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                settings.autoInjectAssets = false;
+                var event = this.get( "main.index" );
+                var html = event.getRenderedContent();
+                expect( html ).notToInclude( "<!-- CBWIRE Styles -->" );
+                expect( html ).notToInclude( "<!-- CBWIRE Scripts -->" );
+                expect( reMatchNoCase( "CBWIRE Styles", html ).len() ).toBe( 0 );
+                expect( reMatchNoCase( "CBWIRE Scripts", html ).len() ).toBe( 0 );
+            } );
+
+            it( "should have default updateEndpoint", function() {
+                var CBWIREController = getInstance( "CBWIREController@cbwire" );
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                expect( CBWIREController.getUpdateEndpoint() ).toBe( "/cbwire/update" );
+            } );
+
+            it( "should be able to set updateEndpoint", function() {
+                var CBWIREController = getInstance( "CBWIREController@cbwire" );
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                settings.updateEndpoint = "/index.cfm/cbwire/update";
+                expect( CBWIREController.getUpdateEndpoint() ).toBe( "/index.cfm/cbwire/update" );
+            } );
+
+        } );
+
         describe("Component.cfc", function() {
 
             beforeEach(function(currentSpec) {
@@ -9,7 +49,9 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 // and prepareMock() is a custom method to mock any dependencies, if necessary.
                 setup();
                 testComponent = getInstance("wires.TestComponent");
-                testComponent._withEvent( getRequestContext( ) );
+                testComponent
+                    ._withEvent( getRequestContext( ) )
+                    ._withPath( "wires.TestComponent" );
                 CBWIREController = getInstance( "CBWIREController@cbwire" );
                 prepareMock( testComponent );
             });
@@ -125,6 +167,31 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 expect( result ).toInclude( "<p>Result: Hello World!</p>" );
             } );
 
+            it( "should support deep nesting with correct count of children", function() {
+                var result = CBWIREController.wire( "test.should_support_deep_nesting" );
+                var parent = parseRendering( result, 1 );
+                var child1 = parseRendering( result, 2 );
+                var child2 = parseRendering( result, 3 );
+                expect( parent.snapshot.memo.children.count() ).toBe( 2 );
+                expect( child1.snapshot.memo.children.count() ).toBe( 1 );
+                expect( child2.snapshot.memo.children.len() ).toBe( 0 );
+            } );
+
+            it( "shouldn't isolate by default", function() {
+                var result = CBWIREController.wire( "test.shouldnt_isolate_by_default" );
+                expect( result ).toInclude( "&quot;isolate&quot;:false" );
+            } );
+
+            it( "should isolate when using isolate=true", function() {
+                var result = CBWIREController.wire( "test.should_isolate_when_using_isolate_true" );
+                expect( result ).toInclude( "&quot;isolate&quot;:true" );
+            } );
+
+            it( "should isolate when using lazyLoad=true", function() {
+                var result = CBWIREController.wire( "test.should_isolate_when_using_lazyLoad_true" );
+                expect( result ).toInclude( "&quot;isolate&quot;:true" );
+            } );
+
             it( "should support hasErrors(), hasError( prop ), and getError( prop ) for validation", function() {
                 var result = CBWIREController.wire( "test.should_support_hasErrors_hasError_getError_for_validation" );
                 expect( result ).toInclude( "<p>Has errors: true</p>" );
@@ -325,6 +392,50 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 prepareMock( cbwireController );
             });
 
+            it( "should trim string values if global setting enabled on coldbox.cfc", () => {
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                settings.trimStringValues = true;
+                var payload = incomingRequest(
+                    memo = {
+                        "name": "test.should_trim_string_values_if_global_setting_enabled",
+                        "id": "Z1Ruz1tGMPXSfw7osBW2",
+                        "children": []
+                    },
+                    data = {
+                        "name": "Jane Doe "
+                    },
+                    calls = [],
+                    updates = {
+                        "name": " Jane Doe "
+                    }
+                );
+                var result = cbwireController.handleRequest( payload, event );
+                expect( result.components.first().effects.html ).toInclude( "<p>Name: Jane Doe</p>" );
+                settings.trimStringValues = false;
+            } );
+
+            it( "should trim string values if enabled on component", () => {
+                var settings = getInstance( "coldbox:modulesettings:cbwire" );
+                settings.trimStringValues = false;
+                var payload = incomingRequest(
+                    memo = {
+                        "name": "test.should_trim_string_values_if_enabled_on_component",
+                        "id": "Z1Ruz1tGMPXSfw7osBW2",
+                        "children": []
+                    },
+                    data = {
+                        "name": "Jane Doe "
+                    },
+                    calls = [],
+                    updates = {
+                        "name": " Jane Doe "
+                    }
+                );
+                var result = cbwireController.handleRequest( payload, event );
+                expect( result.components.first().effects.html ).toInclude( "<p>Name: Jane Doe</p>" );
+                settings.trimStringValues = false;
+            } );
+
             it( "should support $refresh action", function() {
                 var payload = incomingRequest(
                     memo = {
@@ -362,7 +473,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 expect( reFindNoCase( "<div wire:id=""([A-Za-z0-9]+)"" x-data=""{", result.components.first().effects.html ) ).toBeGT( 0 );
             } );
 
-            it( "should throw a 403 forbidden error if the CSRF token doesn't match", function() {
+            it( "should throw a 419 Page Expired error if the CSRF token doesn't match", function() {
                 var payload = incomingRequest(
                     memo = {
                         "name": "TestComponent",
@@ -376,7 +487,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 );
                 expect( function() {
                     cbwireController.handleRequest( payload, event );
-                } ).toThrow( type="CBWIREException", message="Invalid CSRF token." );
+                } ).toThrow( type="CBWIREException", message="Page expired." );
             } );
 
             it( "should provide a handleRequest() method that returns subsequent payloads", function() {
@@ -644,6 +755,65 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 expect( snapshot.memo.children.count() ).toBe( 1 );
             } );
 
+            it(" should call onUpdate if it exists", function() {
+                var payload = incomingRequest(
+                    memo = {
+                        "name": "test.should_call_onupdate",
+                        "id": "Z1Ruz1tGMPXSfw7osBW2",
+                        "children": []
+                    },
+                    data = {
+                        "cbwireVersion": 3
+                    },
+                    calls = [],
+                    updates = {
+                        "cbwireVersion": 4
+                    }
+                );
+                var response = cbwireController.handleRequest( payload, event );
+                expect( response.components[1].effects.html ).toInclude( "onUpdateCalled: true" );
+            } );
+
+            it( "should not call onupdate if no updates are actually passed", function() {
+                var payload = incomingRequest(
+                    memo = {
+                        "name": "test.should_call_onupdate",
+                        "id": "Z1Ruz1tGMPXSfw7osBW2",
+                        "children": []
+                    },
+                    data = {
+                        "cbwireVersion": 3
+                    },
+                    calls = [],
+                    updates = {}
+                );
+                var response = cbwireController.handleRequest( payload, event );
+                expect( response.components[1].effects.html ).toInclude( "onUpdateCalled: false" );
+            } );
+
+            it( "should call onUpdate[Property] if it exists", function() {
+                var payload = incomingRequest(
+                    memo = {
+                        "name": "test.should_call_onupdate_property",
+                        "id": "Z1Ruz1tGMPXSfw7osBW2",
+                        "children": []
+                    },
+                    data = {
+                        "cbwireVersion": 3,
+                        "newValue": "",
+                        "oldValue": ""
+                    },
+                    calls = [],
+                    updates = {
+                        "cbwireVersion": 4
+                    }
+                );
+                var response = cbwireController.handleRequest( payload, event );
+                expect( response.components[1].effects.html ).toInclude( "CBWIRE Version: 4" );
+                expect( response.components[1].effects.html ).toInclude( "New Value: 4" );
+                expect( response.components[1].effects.html ).toInclude( "Old Value: 3" );
+            } );
+
             it( "should call onHydrate() if it exists", function() {
                 var payload = incomingRequest(
                     memo = {
@@ -905,9 +1075,41 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 setup();
                 testComponent = getInstance("wires.TestComponent"); // Assuming TestComponent is a component that supports lazy loading
                 testComponent._withEvent(getRequestContext());
+                CBWIREController = getInstance( "CBWIREController@cbwire" );
                 prepareMock(testComponent);
             });
 
+            it( "should isolate when lazy loading", function() {
+                var lazyHtml = testComponent.wire(
+                    name="TestComponent",
+                    params={},
+                    key="",
+                    lazy=true
+                );
+                expect( lazyHtml ).toInclude( "&quot;isolate&quot;:true" );
+            } );
+
+            it( "should lazy load a component using the original outer element", function() {
+                var lazyHtml = testComponent.wire(
+                    name="TestTableRowComponent",
+                    params={},
+                    key="",
+                    lazy=true
+                );
+                expect( reFindNoCase( "^<tr\s+", lazyHTML.trim() ) ).toBeTrue();
+            } );
+
+            it( "It should throw error if lazy component doesn't have a placeholder", function() {
+                expect( function() {
+                    testComponent.wire(
+                        name="TestComponentWithoutPlaceholder",
+                        params={},
+                        key="",
+                        lazy=true
+                    );
+                } ).toThrow( type="CBWIREException", message="Lazy loaded components must have a placeholder." );
+            } );
+
             it("should return a base64-encoded lazy loading snapshot when wire() is called with lazy=true", function() {
                 var lazyHtml = testComponent.wire(
                     name="TestComponent",
@@ -931,6 +1133,23 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 // Check that the actual component content is not included in the output
                 expect(lazyHtml).notToInclude("Actual Component Content");
             });
+
+            it( "should detect lazy loaded children", function() {
+                var parentHTML = CBWIREController.wire( "test.should_detect_lazy_loaded_children" );
+                var childHTML = reMatchNoCase( "<!-- start child -->.*<!-- end child -->", parentHTML )[ 1 ];
+                // Remove child HTML from parent HTML
+                parentHTML = replaceNoCase( parentHTML, childHTML, "", "one" );
+                var parent = parseRendering( parentHTML );
+                var child = parseRendering( childHTML );
+                // Ensure parent and child ids are different
+                expect( parent.snapshot.memo.id ).notToBe( child.snapshot.memo.id );
+                // Ensure parent has a child and it's the lazy loaded child
+                expect( structCount( parent.snapshot.memo.children ) ).toBe( 1 );
+                var keys = structKeyArray( parent.snapshot.memo.children );
+                expect( parent.snapshot.memo.children[ keys[ 1 ] ] ).toBeArray();
+                expect( parent.snapshot.memo.children[ keys[ 1 ] ][ 1 ] ).toBe( "div" );
+                expect( parent.snapshot.memo.children[ keys[ 1 ] ][ 2 ] ).toBe( child.snapshot.memo.id );
+            } );
         });
 
         describe("CBWIREController", function() {
@@ -1023,7 +1242,10 @@ component extends="coldbox.system.testing.BaseTestCase" {
 				expect( result ).toContain( "Nested module component using default wires location" );
 			} );
 
-
+            it( "can load components from an external modules folder", function() {
+                var result = cbwireController.wire( "should_load_external_modules@ExternalModule" );
+                expect( result ).toInclude( "External Module Loaded" );
+            } );
         });
 
         describe( "Preprocessors", function() {
diff --git a/test-harness/wires/Counter.cfc b/test-harness/wires/Counter.cfc
index 07b2d49..3058751 100644
--- a/test-harness/wires/Counter.cfc
+++ b/test-harness/wires/Counter.cfc
@@ -7,4 +7,8 @@ component extends="cbwire.models.Component" {
         data.counter++;
     }
 
+    function placeholder() {
+        return "<div>some placeholder</div>";
+    }
+
 }
\ No newline at end of file
diff --git a/test-harness/wires/TestComponent.cfc b/test-harness/wires/TestComponent.cfc
index a58cee5..534e174 100644
--- a/test-harness/wires/TestComponent.cfc
+++ b/test-harness/wires/TestComponent.cfc
@@ -55,7 +55,7 @@ component extends="cbwire.models.Component" {
     }
 
     function placeholder() {
-        return "Test Placeholder";
+        return "<div>Test Placeholder</div>";
     }
 
     function clearFrameworks(){
diff --git a/test-harness/wires/TestComponentWithoutPlaceholder.cfm b/test-harness/wires/TestComponentWithoutPlaceholder.cfm
new file mode 100644
index 0000000..7593243
--- /dev/null
+++ b/test-harness/wires/TestComponentWithoutPlaceholder.cfm
@@ -0,0 +1,13 @@
+<cfoutput>
+    <div>test component without placeholder</div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+    data = {};
+
+    function placeholder() {
+        return "";
+    }
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/TestTableRowComponent.cfm b/test-harness/wires/TestTableRowComponent.cfm
new file mode 100644
index 0000000..839c05e
--- /dev/null
+++ b/test-harness/wires/TestTableRowComponent.cfm
@@ -0,0 +1,15 @@
+<cfoutput>
+    <tr>
+        <td>test table row component</td>
+    </tr>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+    data = {};
+
+    function placeholder() {
+        return "<tr><td>some placholder</td></tr>";
+    }
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/lazyloading.cfm b/test-harness/wires/lazyloading.cfm
index ee1e931..a88a9d2 100644
--- a/test-harness/wires/lazyloading.cfm
+++ b/test-harness/wires/lazyloading.cfm
@@ -3,7 +3,7 @@
         <h1>Lazy Loading</h1>
 
         <div style="margin-top:500px">
-            #wire( name="SlowComponent", params={ "sleepTime": 10000 }, lazy=true )#
+            #wire( name="SlowComponent", params={ "sleepTime": 1000 }, lazy=true )#
         </div>
     </div>
 </cfoutput>
\ No newline at end of file
diff --git a/test-harness/wires/test/child1.cfm b/test-harness/wires/test/child1.cfm
new file mode 100644
index 0000000..1378035
--- /dev/null
+++ b/test-harness/wires/test/child1.cfm
@@ -0,0 +1,12 @@
+<cfoutput>
+    <div>
+        <h1>child 1</h1>
+        #wire( "test.child2" )#
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/child2.cfm b/test-harness/wires/test/child2.cfm
new file mode 100644
index 0000000..d3254af
--- /dev/null
+++ b/test-harness/wires/test/child2.cfm
@@ -0,0 +1,11 @@
+<cfoutput>
+    <div>
+        <h1>child 2</h1>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/child_component.cfm b/test-harness/wires/test/child_component.cfm
index efd42de..db9213d 100644
--- a/test-harness/wires/test/child_component.cfm
+++ b/test-harness/wires/test/child_component.cfm
@@ -1,6 +1,8 @@
 <cfscript>
     // @startWire
-
+    function placeholder() {
+        return "<div>placeholder</div>";
+    }
     // @endWire
 </cfscript>
 
diff --git a/test-harness/wires/test/should_call_onupdate.cfm b/test-harness/wires/test/should_call_onupdate.cfm
new file mode 100644
index 0000000..6977b80
--- /dev/null
+++ b/test-harness/wires/test/should_call_onupdate.cfm
@@ -0,0 +1,20 @@
+<cfoutput>
+    <div>
+        <h1>Should Call OnUpdate</h1>
+        <p>
+            onUpdateCalled: #onUpdateCalled#
+        </p>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire 
+    data = {
+        "onUpdateCalled": false
+    };
+
+    function onUpdate( newValues, oldValues ){
+        data.onUpdateCalled = true;
+    }
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_call_onupdate_property.cfm b/test-harness/wires/test/should_call_onupdate_property.cfm
new file mode 100644
index 0000000..ce3a5a6
--- /dev/null
+++ b/test-harness/wires/test/should_call_onupdate_property.cfm
@@ -0,0 +1,24 @@
+<cfoutput>
+    <div>
+        <h1>Should call onupdate property</h1>
+        <p>CBWIRE Version: #cbwireVersion#</p>
+        <p>New Value: #newValue#</p>
+        <p>Old Value: #oldValue#</p>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+    data = {
+        "cbwireVersion": 3,
+        "newValue": "",
+        "oldValue": ""
+    };
+
+    function onUpdateCBWIREVersion( value, oldValue ) {
+        data.cbwireVersion = arguments.value;
+        data.newValue = arguments.value;
+        data.oldValue = arguments.oldValue;
+    }
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_detect_lazy_loaded_children.cfm b/test-harness/wires/test/should_detect_lazy_loaded_children.cfm
new file mode 100644
index 0000000..b7f8844
--- /dev/null
+++ b/test-harness/wires/test/should_detect_lazy_loaded_children.cfm
@@ -0,0 +1,14 @@
+<cfscript>
+    // @startWire
+
+    // @endWire
+</cfscript>
+
+<cfoutput>
+    <div>
+        <h1>Parent</h1>
+        <!-- start child -->
+        #wire( name="test.child_component", lazy=true )#
+        <!-- end child -->
+    </div>
+</cfoutput>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_isolate_when_using_isolate_true.cfm b/test-harness/wires/test/should_isolate_when_using_isolate_true.cfm
new file mode 100644
index 0000000..62f4d46
--- /dev/null
+++ b/test-harness/wires/test/should_isolate_when_using_isolate_true.cfm
@@ -0,0 +1,14 @@
+<cfscript>
+    // @startWire
+    isolate = true;
+
+    data = {
+    };
+    // @endWire
+</cfscript>
+
+<cfoutput>
+    <div>
+        <h1>Should isolate when using isolate=true</h1>
+    </div>
+</cfoutput>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_isolate_when_using_lazyLoad_true.cfm b/test-harness/wires/test/should_isolate_when_using_lazyLoad_true.cfm
new file mode 100644
index 0000000..81cb25b
--- /dev/null
+++ b/test-harness/wires/test/should_isolate_when_using_lazyLoad_true.cfm
@@ -0,0 +1,14 @@
+<cfscript>
+    // @startWire
+    lazyLoad = true;
+
+    data = {
+    };
+    // @endWire
+</cfscript>
+
+<cfoutput>
+    <div>
+        <h1>Should isolate when using lazyLoad=true</h1>
+    </div>
+</cfoutput>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_support_deep_nesting.cfm b/test-harness/wires/test/should_support_deep_nesting.cfm
new file mode 100644
index 0000000..c6d6909
--- /dev/null
+++ b/test-harness/wires/test/should_support_deep_nesting.cfm
@@ -0,0 +1,13 @@
+<cfoutput>
+    <div>
+        <h1>Should support deep nesting</h1>
+        #wire( "test.child1" )#
+        #wire( "test.child1" )#
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_trim_string_values_if_enabled_on_component.cfm b/test-harness/wires/test/should_trim_string_values_if_enabled_on_component.cfm
new file mode 100644
index 0000000..a48243e
--- /dev/null
+++ b/test-harness/wires/test/should_trim_string_values_if_enabled_on_component.cfm
@@ -0,0 +1,15 @@
+<cfoutput>
+    <div>
+        <p>Name: #name#</p>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+    trimStringValues = true;
+
+    data = {
+        "name": "Jane Doe"
+    };
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/should_trim_string_values_if_global_setting_enabled.cfm b/test-harness/wires/test/should_trim_string_values_if_global_setting_enabled.cfm
new file mode 100644
index 0000000..7b62ac5
--- /dev/null
+++ b/test-harness/wires/test/should_trim_string_values_if_global_setting_enabled.cfm
@@ -0,0 +1,13 @@
+<cfoutput>
+    <div>
+        <p>Name: #name#</p>
+    </div>
+</cfoutput>
+
+<cfscript>
+    // @startWire
+    data = {
+        "name": "Jane Doe"
+    };
+    // @endWire
+</cfscript>
\ No newline at end of file
diff --git a/test-harness/wires/test/shouldnt_isolate_by_default.cfm b/test-harness/wires/test/shouldnt_isolate_by_default.cfm
new file mode 100644
index 0000000..c6001c5
--- /dev/null
+++ b/test-harness/wires/test/shouldnt_isolate_by_default.cfm
@@ -0,0 +1,12 @@
+<cfscript>
+    // @startWire
+    data = {
+    };
+    // @endWire
+</cfscript>
+
+<cfoutput>
+    <div>
+        <h1>Shouldn't isolate by default</h1>
+    </div>
+</cfoutput>
\ No newline at end of file
diff --git a/views/errors/pageExpired.cfm b/views/errors/pageExpired.cfm
new file mode 100644
index 0000000..488be49
--- /dev/null
+++ b/views/errors/pageExpired.cfm
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>Page Expired</title>
+
+        <style>
+            /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}a{background-color:transparent}code{font-family:monospace,monospace;font-size:1em}[hidden]{display:none}html{font-family:system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #e2e8f0}a{color:inherit;text-decoration:inherit}code{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}svg,video{display:block;vertical-align:middle}video{max-width:100%;height:auto}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f7fafc;background-color:rgba(247,250,252,var(--bg-opacity))}.border-gray-200{--border-opacity:1;border-color:#edf2f7;border-color:rgba(237,242,247,var(--border-opacity))}.border-gray-400{--border-opacity:1;border-color:#cbd5e0;border-color:rgba(203,213,224,var(--border-opacity))}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.flex{display:flex}.grid{display:grid}.hidden{display:none}.items-center{align-items:center}.justify-center{justify-content:center}.font-semibold{font-weight:600}.h-5{height:1.25rem}.h-8{height:2rem}.h-16{height:4rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.leading-7{line-height:1.75rem}.mx-auto{margin-left:auto;margin-right:auto}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.ml-2{margin-left:.5rem}.mt-4{margin-top:1rem}.ml-4{margin-left:1rem}.mt-8{margin-top:2rem}.ml-12{margin-left:3rem}.-mt-px{margin-top:-1px}.max-w-xl{max-width:36rem}.max-w-6xl{max-width:72rem}.min-h-screen{min-height:100vh}.overflow-hidden{overflow:hidden}.p-6{padding:1.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.pt-8{padding-top:2rem}.fixed{position:fixed}.relative{position:relative}.top-0{top:0}.right-0{right:0}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.text-center{text-align:center}.text-gray-200{--text-opacity:1;color:#edf2f7;color:rgba(237,242,247,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#e2e8f0;color:rgba(226,232,240,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#a0aec0;color:rgba(160,174,192,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#718096;color:rgba(113,128,150,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#4a5568;color:rgba(74,85,104,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#1a202c;color:rgba(26,32,44,var(--text-opacity))}.uppercase{text-transform:uppercase}.underline{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.w-5{width:1.25rem}.w-8{width:2rem}.w-auto{width:auto}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}@-webkit-keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@-webkit-keyframes ping{0%{transform:scale(1);opacity:1}75%,to{transform:scale(2);opacity:0}}@keyframes ping{0%{transform:scale(1);opacity:1}75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}@keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:translateY(0);-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:translateY(0);-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@media (min-width:640px){.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:items-center{align-items:center}.sm\:justify-start{justify-content:flex-start}.sm\:justify-between{justify-content:space-between}.sm\:h-20{height:5rem}.sm\:ml-0{margin-left:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:pt-0{padding-top:0}.sm\:text-left{text-align:left}.sm\:text-right{text-align:right}}@media (min-width:768px){.md\:border-t-0{border-top-width:0}.md\:border-l{border-left-width:1px}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (min-width:1024px){.lg\:px-8{padding-left:2rem;padding-right:2rem}}@media (prefers-color-scheme:dark){.dark\:bg-gray-800{--bg-opacity:1;background-color:#2d3748;background-color:rgba(45,55,72,var(--bg-opacity))}.dark\:bg-gray-900{--bg-opacity:1;background-color:#1a202c;background-color:rgba(26,32,44,var(--bg-opacity))}.dark\:border-gray-700{--border-opacity:1;border-color:#4a5568;border-color:rgba(74,85,104,var(--border-opacity))}.dark\:text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.dark\:text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}}
+        </style>
+
+        <style>
+            body {
+                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+            }
+        </style>
+    </head>
+    <body class="antialiased">
+        <div class="relative flex items-top justify-center min-h-screen bg-gray-100 dark:bg-gray-900 sm:items-center sm:pt-0">
+            <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
+                <div class="flex items-center pt-8 sm:justify-start sm:pt-0">
+                    <div class="px-4 text-lg text-gray-500 border-r border-gray-400 tracking-wider">
+                        419                    </div>
+
+                    <div class="ml-4 text-lg text-gray-500 uppercase tracking-wider">
+                        Page Expired                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>