diff --git a/components/client/client.wac b/components/client/client.wac
index 076d462..92e1039 100644
--- a/components/client/client.wac
+++ b/components/client/client.wac
@@ -1,6 +1,11 @@
 package componentized:oci;
 
-export new local:internal-client {
-    media-types: new local:media-types {}.media-types,
+let media-types = new local:media-types {};
+
+let client = new local:internal-client {
+    media-types: media-types.media-types,
     ...
-}...;
+};
+
+export client...;
+export media-types...;