diff --git a/lib/app-router.js b/lib/app-router.js
index a308c36..061b13f 100644
--- a/lib/app-router.js
+++ b/lib/app-router.js
@@ -60,11 +60,11 @@ module.exports = function (router) {
 
       case 'create':
 
-        script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;sfdx force:config:set instanceUrl=${instance_url}`;
+        script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;sfdx force:config:set instanceUrl=${instance_url}`;
 
         commands.run(command, script, () => {
 
-          script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;sfdx force:org:create -v '${access_token}' -s -f ${param}`;
+          script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;sfdx force:org:create -v '${access_token}' -s -f ${param}`;
 
           commands.run(command, script, (commandResult, commandErr) => {
 
@@ -86,7 +86,7 @@ module.exports = function (router) {
 
       case 'push':
 
-        script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;sfdx force:source:push --json | jq '.result.pushedSource | length'`;
+        script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;sfdx force:source:push --json | jq '.result.pushedSource | length'`;
 
         commands.run(command, script, (commandResult, commandErr) => {
 
@@ -107,7 +107,7 @@ module.exports = function (router) {
 
       case 'permset':
 
-        script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;sfdx force:user:permset:assign -n ${param}`;
+        script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;sfdx force:user:permset:assign -n ${param}`;
 
         commands.run(command, script, (commandResult, commandErr) => {
 
@@ -137,7 +137,7 @@ module.exports = function (router) {
           break;
         }
 
-        script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;sfdx force:apex:test:run -r human --json | jq -r .result | jq -r .summary | jq -r .outcome`;
+        script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;sfdx force:apex:test:run -r human --json | jq -r .result | jq -r .summary | jq -r .outcome`;
 
         commands.run(command, script, (commandResult, commandErr) => {
 
@@ -158,7 +158,7 @@ module.exports = function (router) {
 
       case 'url':
 
-        script = `${startingDirectory}cd ${directory};export FORCE_SHOW_SPINNER=;echo $(sfdx force:org:display --json | jq -r .result.instanceUrl)"/secur/frontdoor.jsp?sid="$(sfdx force:org:display --json | jq -r .result.accessToken)`;
+        script = `${startingDirectory}cd ${directory};export SFDX_LAZY_LOAD_MODULES=true;export FORCE_SHOW_SPINNER=;echo $(sfdx force:org:display --json | jq -r .result.instanceUrl)"/secur/frontdoor.jsp?sid="$(sfdx force:org:display --json | jq -r .result.accessToken)`;
 
         commands.run(command, script, (commandResult, commandErr) => {