diff --git a/main/cloudfoundry_client/main/main.py b/main/cloudfoundry_client/main/main.py
index 1655d3d..bd9a016 100644
--- a/main/cloudfoundry_client/main/main.py
+++ b/main/cloudfoundry_client/main/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 import argparse
 import json
 import logging
@@ -170,7 +170,7 @@ def main():
     commands = [
         CommandDomain(display_name='Organizations', entity_name='organization',
                       api_version='v3',
-                      filter_list_parameters=[], allow_retrieve_by_name=True,
+                      filter_list_parameters=['names', 'guids'], allow_retrieve_by_name=True,
                       allow_creation=True, allow_deletion=True),
         CommandDomain(display_name='Spaces', entity_name='space', filter_list_parameters=['organization_guid'],
                       allow_retrieve_by_name=True, allow_creation=True, allow_deletion=True),
@@ -196,7 +196,7 @@ def main():
                       allow_retrieve_by_name=False, allow_creation=True, allow_deletion=True),
         CommandDomain(display_name='Buildpacks', entity_name='buildpack',
                       api_version='v3',
-                      filter_list_parameters=[], allow_retrieve_by_name=True,
+                      filter_list_parameters=['names', 'stacks'], allow_retrieve_by_name=True,
                       allow_creation=True, allow_deletion=True),
         CommandDomain(display_name='Domains', entity_name='domain',
                       api_version='v3',
diff --git a/main/cloudfoundry_client/networking/__init__.py b/main/cloudfoundry_client/networking/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/main/cloudfoundry_client/networking/v1/__init__.py b/main/cloudfoundry_client/networking/v1/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/main/cloudfoundry_client/networking/v1/external/__init__.py b/main/cloudfoundry_client/networking/v1/external/__init__.py
new file mode 100644
index 0000000..e69de29