diff --git a/py-json/LANforge/lf_json_autogen.py b/py-json/LANforge/lf_json_autogen.py
index 3b687206..ba9795ee 100644
--- a/py-json/LANforge/lf_json_autogen.py
+++ b/py-json/LANforge/lf_json_autogen.py
@@ -1,16 +1,15 @@
 #!/usr/bin/env python3
 """----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
-    Generated by LANforge JsonApiPythonGenerator, Mon Jun 21 23:25:47 PDT 2021
+    Generated by LANforge JsonApiPythonGenerator, Tue Jun 22 15:59:34 PDT 2021
     This file expects to live in py-json/LANforge directory.
 ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----"""
 import sys
 import json
 import keyword
 from enum import Enum
-from LANforge import LFRequest
-from LANforge.lfcli_base import LFCliBase
+# from LANforge import LFRequest
+# from LANforge.lfcli_base import LFCliBase
 from lfcli_base import LFCliBase
-from typing import NewType, Type
 
 class LFJsonGet(LFCliBase):
     def __init__(self, lfclient_host='localhost',
@@ -87,6 +86,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="attenuator",
                                   plural_key="attenuators")
+    #
 
 
 
@@ -139,6 +139,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="chamber",
                                   plural_key="chambers")
+    #
 
 
 
@@ -185,6 +186,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="",
                                   plural_key="")
+    #
 
 
 
@@ -256,6 +258,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="dut",
                                   plural_key="duts")
+    #
 
 
 
@@ -342,6 +345,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoint")
+    #
 
 
 
@@ -381,6 +385,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="alert",
                                   plural_key="alerts")
+    #
 
 
 
@@ -438,6 +443,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoint")
+    #
 
 
 
@@ -487,6 +493,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoints")
+    #
 
 
 
@@ -518,6 +525,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="",
                                   plural_key="")
+    #
 
 
 
@@ -595,6 +603,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoint")
+    #
 
 
 
@@ -709,6 +718,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="interface",
                                   plural_key="interfaces")
+    #
 
 
 
@@ -765,6 +775,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="radio",
                                   plural_key="radios")
+    #
 
 
 
@@ -823,6 +834,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="resource",
                                   plural_key="resources")
+    #
 
 
 
@@ -854,6 +866,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="scan-results",
                                   plural_key="scan-results")
+    #
 
 
 
@@ -900,6 +913,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="station",
                                   plural_key="stations")
+    #
 
 
 
@@ -931,6 +945,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="sessions/messages",
                                   plural_key="sessions/messages")
+    #
 
 
 
@@ -966,6 +981,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="groups",
                                   plural_key="groups")
+    #
 
 
 
@@ -1000,6 +1016,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="record",
                                   plural_key="records")
+    #
 
 
 
@@ -1047,6 +1064,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="connection",
                                   plural_key="connections")
+    #
 
 
 
@@ -1114,6 +1132,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoints")
+    #
 
 
 
@@ -1179,6 +1198,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="virtual-routers",
                                   plural_key="virtual-routers")
+    #
 
 
 
@@ -1228,6 +1248,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="router-connections",
                                   plural_key="router-connections")
+    #
 
 
 
@@ -1269,6 +1290,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="",
                                   plural_key="")
+    #
 
 
 
@@ -1334,6 +1356,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="endpoint",
                                   plural_key="endpoint")
+    #
 
 
 
@@ -1365,6 +1388,7 @@ class LFJsonGet(LFCliBase):
         return self.extractValues(response=response,
                                   singular_key="",
                                   plural_key="")
+    #
 
 """----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----