diff --git a/examples/authenticate.py b/examples/authenticate.py
index 9061d5087..b674492ca 100644
--- a/examples/authenticate.py
+++ b/examples/authenticate.py
@@ -28,25 +28,12 @@ If you use the environment variables, authenticate with:
 import sys
 
 from examples import common
+from examples import connection
 from examples import transport
-from openstack import connection
 
 
 def make_authenticate(opts):
-    args = {
-        'auth_plugin': opts.auth_plugin,
-        'auth_url': opts.auth_url,
-        'project_name': opts.project_name,
-        'domain_name': opts.domain_name,
-        'project_domain_name': opts.project_domain_name,
-        'user_domain_name': opts.user_domain_name,
-        'user_name': opts.user_name,
-        'password': opts.password,
-        'verify': opts.verify,
-        'token': opts.token,
-    }
-    conn = connection.Connection(**args)
-    return conn.authenticator
+    return connection.make_connection(opts).session.authenticator
 
 
 def run_authenticate(opts):
diff --git a/examples/common.py b/examples/common.py
index 0c86030e9..4303ee8fb 100755
--- a/examples/common.py
+++ b/examples/common.py
@@ -291,7 +291,7 @@ def option_parser():
     parser.add_argument(
         '--data',
         metavar='<data>',
-        default='{}',
+        default={},
         help='Json data for command.',
     )
     parser.add_argument(
diff --git a/examples/connection.py b/examples/connection.py
new file mode 100644
index 000000000..88a0199f8
--- /dev/null
+++ b/examples/connection.py
@@ -0,0 +1,55 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""
+Example Connection Command
+
+Make sure you can authenticate before running this command.
+
+For example:
+    python -m examples.connection
+"""
+
+import sys
+
+from examples import common
+from openstack import connection
+
+
+def make_connection(opts):
+    args = {
+        'auth_plugin': opts.auth_plugin,
+        'auth_url': opts.auth_url,
+        'project_name': opts.project_name,
+        'domain_name': opts.domain_name,
+        'project_domain_name': opts.project_domain_name,
+        'user_domain_name': opts.user_domain_name,
+        'user_name': opts.user_name,
+        'password': opts.password,
+        'verify': opts.verify,
+        'token': opts.token,
+    }
+    conn = connection.Connection(preference=opts.user_preferences, **args)
+    return conn
+
+
+def run_connection(opts):
+    conn = make_connection(opts)
+    print("Connection: %s" % conn)
+    for flavor in conn.compute.list_flavors():
+        print(flavor.id + " " + flavor.name)
+    return
+
+
+if __name__ == "__main__":
+    opts = common.setup()
+    sys.exit(common.main(opts, run_connection))
diff --git a/examples/session.py b/examples/session.py
index 03ac8ee3f..fe55a7cf4 100644
--- a/examples/session.py
+++ b/examples/session.py
@@ -23,25 +23,12 @@ For example:
 import sys
 
 from examples import common
-from openstack import connection
+from examples import connection
 from openstack.identity import identity_service
 
 
 def make_session(opts):
-    args = {
-        'auth_plugin': opts.auth_plugin,
-        'auth_url': opts.auth_url,
-        'project_name': opts.project_name,
-        'domain_name': opts.domain_name,
-        'project_domain_name': opts.project_domain_name,
-        'user_domain_name': opts.user_domain_name,
-        'user_name': opts.user_name,
-        'password': opts.password,
-        'verify': opts.verify,
-        'token': opts.token,
-    }
-    conn = connection.Connection(preference=opts.user_preferences, **args)
-    return conn.session
+    return connection.make_connection(opts).session
 
 
 def run_session(opts):