diff --git a/examples/node/src/rest/api/v2010/account/call.ts b/examples/node/src/rest/api/v2010/account/call.ts
index 81442a4d0..08edabcb0 100644
--- a/examples/node/src/rest/api/v2010/account/call.ts
+++ b/examples/node/src/rest/api/v2010/account/call.ts
@@ -375,6 +375,7 @@ export function CallListInstance(
       return instance._feedbackCallSummary;
     },
   });
+
   instance.create = function create(
     params: CallListInstanceCreateOptions,
     callback?: (error: Error | null, items: CallInstance) => any,
diff --git a/examples/node/src/rest/flexApi/v1/credential.ts b/examples/node/src/rest/flexApi/v1/credential.ts
index 9669f10c0..7cf3bf7a3 100644
--- a/examples/node/src/rest/flexApi/v1/credential.ts
+++ b/examples/node/src/rest/flexApi/v1/credential.ts
@@ -65,6 +65,7 @@ export function CredentialListInstance(version: V1): CredentialListInstance {
       return instance._newCredentials;
     },
   });
+
   instance.toJSON = function toJSON() {
     return instance._solution;
   };
diff --git a/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java
index 186aa053f..59ca136e8 100644
--- a/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java
+++ b/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java
@@ -12,7 +12,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import io.swagger.v3.oas.models.parameters.Parameter;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenParameter;
@@ -64,12 +63,6 @@ public ApiResourceBuilder updateOperations(final Resolver<CodegenParameter> code
                     dependent.setClassName(resourceName + "Import");
                     dependent.setImportName(resourceName + " as " + dependent.getType());
                 }
-                if(!dependent.isInstanceDependent()) {
-                    for(Parameter pathParam : dependent.getPathParams()) {
-                       if(pathParam.getName().startsWith(co.baseName))
-                           pathParam.addExtension("x-is-non-instance-parent-param", true);
-                    }
-                }
             });
         }
 
diff --git a/src/main/resources/twilio-node/api-single.mustache b/src/main/resources/twilio-node/api-single.mustache
index b51480d71..086c0b1e3 100644
--- a/src/main/resources/twilio-node/api-single.mustache
+++ b/src/main/resources/twilio-node/api-single.mustache
@@ -169,27 +169,15 @@ export function {{apiName}}ListInstance(version: {{apiVersionClass}}{{#listPathP
 
   {{#dependents}}
   {{^instanceDependent}}
-
   Object.defineProperty(instance, "{{mountName}}", {
-  {{^pathParams}}
-  {{>getDependent}}
-  {{/pathParams}}
-  {{#pathParams.0}}
-  {{#extensions.x-is-non-instance-parent-param}}
-     get: function() {
-        return ({{#pathParams}}{{#extensions.x-is-non-instance-parent-param}}{{name}}: {{schema.type}}{{^-last}} ,{{/-last}}{{/extensions.x-is-non-instance-parent-param}}{{/pathParams}}) => {
-        if (!instance._{{mountName}}) {
-          instance._{{mountName}} = {{className}}(instance._version, {{#pathParams}}{{#extensions.x-is-non-instance-parent-param}}{{name}}{{^-last}} ,{{/-last}}{{/extensions.x-is-non-instance-parent-param}}{{/pathParams}});
-        }
-        return instance._{{mountName}};
-      };
-     }
-  {{/extensions.x-is-non-instance-parent-param}}
-  {{^extensions.x-is-non-instance-parent-param}}
-  {{>getDependent}}
-  {{/extensions.x-is-non-instance-parent-param}}
-  {{/pathParams.0}}
+    get: function {{mountName}}() {
+      if (!instance._{{mountName}}) {
+        instance._{{mountName}} = {{className}}(instance._version{{#listPathParams}}, instance._solution.{{paramName}}{{/listPathParams}});
+      }
+      return instance._{{mountName}};
+    }
   });
+
   {{/instanceDependent}}
   {{/dependents}}
 {{#operations}}