diff --git a/fixtures/default_scan_engines.yaml b/fixtures/default_scan_engines.yaml
index a06311a3..8945da0c 100644
--- a/fixtures/default_scan_engines.yaml
+++ b/fixtures/default_scan_engines.yaml
@@ -9,13 +9,15 @@
     fetch_url: true
     yaml_configuration: "subdomain_discovery:\r\n    # available tools are Sublist3r,\
       \ amass, assetfinder, subfinder\r\n    # Usage of many tools may improve the\
-      \ results but also may take longer time to scan\r\n    uses_tool: [ subfinder,\
-      \ sublist3r ]\r\n    thread: 10\r\n\r\nport_scan:\r\n    # currently reNgine\
-      \ only supports naabu, nmap and other port scanning tools\r\n    # will be made\
-      \ available in future release\r\n    # scan_ports available options are top-100,\
-      \ top-1000, full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\
-      \n    # if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\
-      \n    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
+      \ results but also may take longer time to scan\r\n    uses_tool: [ amass-passive,\
+      \ subfinder, sublist3r ]\r\n    thread: 10\r\n    # Your wordlist shortname\
+      \ for amass active enumeration, ignore if you are using passive enumeration\r\
+      \n    wordlist: default\r\n\r\nport_scan:\r\n    # currently reNgine only supports\
+      \ naabu, nmap and other port scanning tools\r\n    # will be made available\
+      \ in future release\r\n    # scan_ports available options are top-100, top-1000,\
+      \ full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\n    #\
+      \ if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\n\
+      \    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
       \    # currently runs aquatone\r\n    # available options for ports are small,\
       \ medium, large, xlarge\r\n    port: xlarge\r\n    thread: 2\r\n\r\nsubdomain_takeover:\r\
       \n    # only subjack is supported at this time\r\n    thread: 1\r\n\r\ndir_file_search:\r\
@@ -26,7 +28,7 @@
       \ default uses dirsearch default dicc.txt wordlist\r\n    wordlist: default\r\
       \n\r\nfetch_url:\r\n    # supported tools are gau and hakrawler\r\n    # usage\
       \ -> uses_tool: [ gau, hakrawler]\r\n    uses_tool: [ gau, hakrawler ]"
-    default_engine: true
+    default_engine: false
 - model: scanEngine.enginetype
   pk: 2
   fields:
@@ -38,13 +40,15 @@
     fetch_url: true
     yaml_configuration: "subdomain_discovery:\r\n    # available tools are Sublist3r,\
       \ amass, assetfinder, subfinder\r\n    # Usage of many tools may improve the\
-      \ results but also may take longer time to scan\r\n    uses_tool: [ subfinder,\
-      \ sublist3r ]\r\n    thread: 10\r\n\r\nport_scan:\r\n    # currently reNgine\
-      \ only supports naabu, nmap and other port scanning tools\r\n    # will be made\
-      \ available in future release\r\n    # scan_ports available options are top-100,\
-      \ top-1000, full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\
-      \n    # if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\
-      \n    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
+      \ results but also may take longer time to scan\r\n    uses_tool: [ amass-passive,\
+      \ subfinder, sublist3r ]\r\n    thread: 10\r\n    # Your wordlist shortname\
+      \ for amass active enumeration, ignore if you are using passive enumeration\r\
+      \n    wordlist: default\r\n\r\nport_scan:\r\n    # currently reNgine only supports\
+      \ naabu, nmap and other port scanning tools\r\n    # will be made available\
+      \ in future release\r\n    # scan_ports available options are top-100, top-1000,\
+      \ full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\n    #\
+      \ if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\n\
+      \    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
       \    # currently runs aquatone\r\n    # available options for ports are small,\
       \ medium, large, xlarge\r\n    port: xlarge\r\n    thread: 2\r\n\r\nsubdomain_takeover:\r\
       \n    # only subjack is supported at this time\r\n    thread: 1\r\n\r\ndir_file_search:\r\
@@ -55,7 +59,7 @@
       \ default uses dirsearch default dicc.txt wordlist\r\n    wordlist: default\r\
       \n\r\nfetch_url:\r\n    # supported tools are gau and hakrawler\r\n    # usage\
       \ -> uses_tool: [ gau, hakrawler]\r\n    uses_tool: [ gau, hakrawler ]"
-    default_engine: true
+    default_engine: false
 - model: scanEngine.enginetype
   pk: 3
   fields:
@@ -67,13 +71,15 @@
     fetch_url: false
     yaml_configuration: "subdomain_discovery:\r\n    # available tools are Sublist3r,\
       \ amass, assetfinder, subfinder\r\n    # Usage of many tools may improve the\
-      \ results but also may take longer time to scan\r\n    uses_tool: [ subfinder,\
-      \ sublist3r ]\r\n    thread: 10\r\n\r\nport_scan:\r\n    # currently reNgine\
-      \ only supports naabu, nmap and other port scanning tools\r\n    # will be made\
-      \ available in future release\r\n    # scan_ports available options are top-100,\
-      \ top-1000, full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\
-      \n    # if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\
-      \n    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
+      \ results but also may take longer time to scan\r\n    uses_tool: [ amass-passive,\
+      \ subfinder, sublist3r ]\r\n    thread: 10\r\n    # Your wordlist shortname\
+      \ for amass active enumeration, ignore if you are using passive enumeration\r\
+      \n    wordlist: default\r\n\r\nport_scan:\r\n    # currently reNgine only supports\
+      \ naabu, nmap and other port scanning tools\r\n    # will be made available\
+      \ in future release\r\n    # scan_ports available options are top-100, top-1000,\
+      \ full or custom like\r\n    # [80, 443]\r\n    ports: [ top-100 ]\r\n    #\
+      \ if you want to exclude certain ports, usage: exclude_ports: [80, 443]\r\n\
+      \    exclude_ports: null\r\n    thread: 10\r\n\r\nvisual_identification:\r\n\
       \    # currently runs aquatone\r\n    # available options for ports are small,\
       \ medium, large, xlarge\r\n    port: xlarge\r\n    thread: 2\r\n\r\nsubdomain_takeover:\r\
       \n    # only subjack is supported at this time\r\n    thread: 1\r\n\r\ndir_file_search:\r\
@@ -84,4 +90,4 @@
       \ default uses dirsearch default dicc.txt wordlist\r\n    wordlist: default\r\
       \n\r\nfetch_url:\r\n    # supported tools are gau and hakrawler\r\n    # usage\
       \ -> uses_tool: [ gau, hakrawler]\r\n    uses_tool: [ gau, hakrawler ]"
-    default_engine: true
+    default_engine: false
diff --git a/scanEngine/templates/scanEngine/add_engine.html b/scanEngine/templates/scanEngine/add_engine.html
index afc3d912..883a23d1 100644
--- a/scanEngine/templates/scanEngine/add_engine.html
+++ b/scanEngine/templates/scanEngine/add_engine.html
@@ -59,8 +59,10 @@ $(document).ready(function() {
 	editor.setValue(`subdomain_discovery:
     # available tools are Sublist3r, amass, assetfinder, subfinder
     # Usage of many tools may improve the results but also may take longer time to scan
-    uses_tool: [ subfinder, sublist3r ]
+    uses_tool: [ amass-passive, subfinder, sublist3r ]
     thread: 10
+    # Your wordlist shortname for amass active enumeration, ignore if you are using passive enumeration
+    wordlist: default
 
 port_scan:
     # currently reNgine only supports naabu, nmap and other port scanning tools
diff --git a/tools/default_settings.yaml b/tools/default_settings.yaml
index 6bd162b8..a43db396 100644
--- a/tools/default_settings.yaml
+++ b/tools/default_settings.yaml
@@ -5,6 +5,7 @@ subdomain_discovery:
     # amass-active or amass-passive
     uses_tool: [ amass-passive, subfinder, sublist3r ]
     thread: 10
+    # Your wordlist shortname for amass active enumeration
     wordlist: default
 
 port_scan: