diff --git a/shared-userspace.yaml b/shared-userspace.yaml
index afc5696..c6ebd18 100644
--- a/shared-userspace.yaml
+++ b/shared-userspace.yaml
@@ -12,11 +12,9 @@ data:
             perl: master
             common-build-dependencies-bootstrap: f26
             common-build-dependencies: f26
-            shared-userspace: f26
             bootstrap: master
         requires:
-            base-runtime: f26
-            shared-userspace: f26
+            base-runtime: master
             perl: master
     references:
         community: https://fedoraproject.org/wiki/Modularity
@@ -25,50 +23,95 @@ data:
     profiles:
         default:
             rpms:
-                - alsa-lib
-                - gtk2
-                - hesiod
-                - libusb
-                - libvirt-client
-                - mesa-libGL
-                - mesa-libGLU
-                - motif
-                - SDL
-                - libicu
-                - libuv
-                - libedit
-                - libaio
-                - compat-openssl10
-                - selinux-policy
-                - time
-                - PyYAML
-                - boost
-                - gperftools
-                - libstemmer
-                - tcp_wrappers
+                 []
+#                - alsa-lib
+#                - gtk2
+#                - hesiod
+#                - libusb
+#                - libvirt-client
+#                - mesa-libGL
+#                - mesa-libGLU
+#                - motif
+#                - SDL
+#                - libicu
+#                - libuv
+#                - libedit
+#                - libaio
+#                - compat-openssl10
+#                - selinux-policy
+#                - time
+#                - PyYAML
+#                - boost
+#                - gperftools
+#                - libstemmer
+#                - python-pymongo
+#                - scons
     api:
         rpms:
-            - alsa-lib
-            - gtk2
-            - hesiod
-            - libusb
-            - libvirt-client
-            - mesa-libGL
-            - mesa-libGLU
-            - motif
-            - SDL
-            - libicu
-            - libuv
-            - libedit
-            - libaio
-            - compat-openssl10
-            - selinux-policy
-            - time
-            - PyYAML
-            - boost
-            - gperftools
-            - libstemmer
-            - tcp_wrappers
+             []
+#            - alsa-lib
+#            - gtk2
+#            - hesiod
+#            - libusb
+#            - libvirt-client
+#            - mesa-libGL
+#            - mesa-libGLU
+#            - motif
+#            - SDL
+#            - libicu
+#            - libuv
+#            - libedit
+#            - libaio
+#            - compat-openssl10
+#            - selinux-policy
+#            - time
+#            - PyYAML
+#            - boost
+#            - gperftools
+#            - libstemmer
+#            - python-pymongo
+#            - scons
+#            - libtool
+#            - tcl
+#            - glib2
+#            - desktop-file-utils
+#            - epydoc
+#            - python2
+#            - chrpath
+#            - dbus-glib
+#            - libcgroup
+#            - checkpolicy
+#            - policycoreutils
+#            - systemtap
+#            - cups
+#            - atk
+#            - cairo
+#            - gdk-pixbuf2
+#            - pango
+#            - libXcomposite
+#            - libXcursor
+#            - libXdamage
+#            - libXfixes
+#            - libXi
+#            - libXinerama
+#            - libXrandr
+#            - libXrender
+#            - libvirt
+#            - libssh
+#            - libxslt
+#            - mesa
+#            - libXext
+#            - libXmu
+#            - libXxf86vm
+#            - libdrm
+#            - libxshmfence
+#            - motif
+#            - libXft
+#            - libXp
+#            - libXt
+#            - xorg-x11-xbitmaps
+#            - libX11
+#            - pulseaudio
     components:
         rpms:
 #           libtool provides libtool-ltdl, a runtime library:
@@ -188,111 +231,19 @@ data:
             libvirt:
                 rationale: Component for shared userspace - libvirt-client.
                 ref: f26
-                buildorder: 15
-            qemu:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 6
-            ceph:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            dnsmasq:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            ebtables:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            git:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            glusterfs:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            iscsi-initiator-utils:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            libpciaccess:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
+                buildorder: 10
             libssh:
                 rationale: Requirement for libvirt-client.
                 ref: f26
                 buildorder: 5
-            openwsman:
+            libxslt:
                 rationale: Requirement for libvirt-client.
                 ref: f26
                 buildorder: 5
-            netcf:
-                rationale: Requirement for libvirt-client.
+            mesa:
+                rationale: Component for shared userspace - mesa-libGL.
                 ref: f26
-                buildorder: 5
-            nfs-utils:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            numactl:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            numad:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            parted:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            polkit:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            qt:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            radvd:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            sanlock:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            scrub:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            sheepdog:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            wireshark:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            xen:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            xhtml1-dtds:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            yajl:
-                rationale: Requirement for libvirt-client.
-                ref: f26
-                buildorder: 5
-            clang:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
+                buildorder: 10
             libXext:
                 rationale: Requirement for mesa-libGL.
                 ref: f26
@@ -305,54 +256,14 @@ data:
                 rationale: Requirement for mesa-libGL.
                 ref: f26
                 buildorder: 5
-            libclc:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
             libdrm:
                 rationale: Requirement for mesa-libGL.
                 ref: f26
                 buildorder: 5
-            libglvnd:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            libomxil-bellagio:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            libva:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            libvdpau:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
             libxshmfence:
                 rationale: Requirement for mesa-libGL.
                 ref: f26
                 buildorder: 5
-            llvm:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            opencl-filesystem:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            wayland:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            python-mako:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
-            vulkan:
-                rationale: Requirement for mesa-libGL.
-                ref: f26
-                buildorder: 5
             mesa-libGLU:
                 rationale: Component for shared userspace - mesa-libGLU.
                 ref: f26
@@ -373,10 +284,6 @@ data:
                 rationale: Requirement for motif.
                 ref: f26
                 buildorder: 5
-            libjpeg-turbo:
-                rationale: Requirement for motif.
-                ref: f26
-                buildorder: 5
             xorg-x11-xbitmaps:
                 rationale: Requirement for motif.
                 ref: f26
@@ -385,26 +292,10 @@ data:
                 rationale: Component for shared userspace - SDL.
                 ref: f26
                 buildorder: 10
-            arts:
-                rationale: Requirement for SDL.
-                ref: f26
-                buildorder: 5
-            audiofile:
-                rationale: Requirement for SDL.
-                ref: f26
-                buildorder: 5
-            esound:
-                rationale: Requirement for SDL.
-                ref: f26
-                buildorder: 5
             libX11:
                 rationale: Requirement for SDL.
                 ref: f26
                 buildorder: 5
-            nas:
-                rationale: Requirement for SDL.
-                ref: f26
-                buildorder: 5
             pulseaudio:
                 rationale: Requirement for SDL.
                 ref: f26
@@ -445,111 +336,19 @@ data:
                 rationale: Component for shared userspace - PyYAML.
                 ref: f26
                 buildorder: 10
-            Cython:
-                rationale: Requirement for PyYAML.
-                ref: f26
-                buildorder: 5
-            libyaml:
-                rationale: Requirement for PyYAML.
-                ref: f26
-                buildorder: 5
             boost:
                 rationale: Component for shared userspace - boost.
                 ref: f26
                 buildorder: 10
-            mpich:
-                rationale: Requirement for boost.
-                ref: f26
-                buildorder: 5
-            openmpi:
-                rationale: Requirement for boost.
-                ref: f26
-                buildorder: 5
             gperftools:
                 rationale: Component for shared userspace - gperftools.
                 ref: f26
                 buildorder: 10
-            libunwind:
-                rationale: Requirement for gperftools.
-                ref: f26
-                buildorder: 5
             libstemmer:
                 rationale: Component for shared userspace - libstemmer.
                 ref: f26
                 buildorder: 10
-            libevent:
-                rationale: Requirement for nfs-utils.
-                ref: f26
-                buildorder: 5
-            tcp_wrappers:
-                rationale: Component for shared userspace - tcp_wrappers
-                ref: f26
-                buildorder: 5
-            augeas:
-                rationale: Requirement for netcf.
-                ref: f26
-                buildorder: 5
-            libnl3:
-                rationale: Requirement for netcf.
-                ref: f26
-                buildorder: 5
-            libxslt:
-                rationale: Requirement for netcf.
-                ref: f26
-                buildorder: 5
-            libssh:
-                rationale: Component for shared userspace - libssh.
+            python-pymongo:
+                rationale: Component for shared userspace - python-pymongo.
                 ref: f26
                 buildorder: 10
-            cmocka:
-                rationale: Requirement for libssh.
-                ref: f26
-                buildorder: 5
-            isns-utils:
-                rationale: Requirement for iscsi-initiator-utils.
-                ref: f26
-                buildorder: 5
-            avahi:
-                rationale: Component for shared userspace - avahi.
-                ref: f26
-                buildorder: 12
-            dbus-python:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            gtk-sharp2:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            gtk3:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            intltool:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            libdaemon:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            mono:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            perl-XML-Parser:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            pygtk2:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            qt3:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5
-            xmltoman:
-                rationale: Requirement for avahi.
-                ref: f26
-                buildorder: 5