diff --git a/etc/default_data.json b/etc/default_data.json
index c7cc7c47f..38f8658ca 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -14141,7 +14141,7 @@
         {
             "id": "openstack",
             "title": "OpenStack",
-            "modules": ["tc-approved-release", "governance", "api-wg"]
+            "modules": ["openstack-official", "governance", "api-wg"]
         },
         {
             "id": "tc-approved-release",
@@ -14149,6 +14149,18 @@
             "child": true,
             "modules": ["tc-approved-release"]
         },
+        {
+            "id": "type:service",
+            "title": "type:service",
+            "child": true,
+            "modules": ["type:service"]
+        },
+        {
+            "id": "type:library",
+            "title": "type:library",
+            "child": true,
+            "modules": ["type:library"]
+        },
         {
             "id": "stackforge",
             "title": "Stackforge",
diff --git a/etc/default_data.schema.json b/etc/default_data.schema.json
index f60b078dd..844fcb76e 100644
--- a/etc/default_data.schema.json
+++ b/etc/default_data.schema.json
@@ -218,7 +218,7 @@
                 "properties": {
                     "id": {
                         "type": "string",
-                        "pattern": "^[\\w-]+$"
+                        "pattern": "^[\\w:-]+$"
                     },
                     "child": {
                         "type": "boolean"
@@ -230,7 +230,7 @@
                         "type": ["array"],
                         "items": {
                             "type": "string",
-                            "pattern": "^[\\w-]+$"
+                            "pattern": "^[\\w:-]+$"
                         }
                     }
                 },
diff --git a/etc/test_default_data.json b/etc/test_default_data.json
index b095ecaac..2e2857c5e 100644
--- a/etc/test_default_data.json
+++ b/etc/test_default_data.json
@@ -187,7 +187,7 @@
         {
             "id": "openstack",
             "title": "OpenStack",
-            "modules": ["tc-approved-release", "governance", "python-openstackclient", "api-wg"]
+            "modules": ["openstack-official", "governance", "api-wg"]
         },
         {
             "id": "tc-approved-release",
@@ -195,6 +195,18 @@
             "child": true,
             "modules": ["tc-approved-release"]
         },
+        {
+            "id": "type:service",
+            "title": "type:service",
+            "child": true,
+            "modules": ["type:service"]
+        },
+        {
+            "id": "type:library",
+            "title": "type:library",
+            "child": true,
+            "modules": ["type:library"]
+        },
         {
             "id": "stackforge",
             "title": "Stackforge",
diff --git a/stackalytics/processor/governance.py b/stackalytics/processor/governance.py
index f72ccc563..b3f700229 100644
--- a/stackalytics/processor/governance.py
+++ b/stackalytics/processor/governance.py
@@ -22,7 +22,15 @@ from stackalytics.processor import utils
 
 LOG = logging.getLogger(__name__)
 
-TAGS = ['tc-approved-release']  # list of supported tags
+# list of supported tags
+TAGS = ['tc-approved-release', 'type:service', 'type:library']
+
+
+def _make_module_group(module_groups, name):
+    m = module_groups[name]  # object created by defaultdict
+    m['tag'] = 'project_type'
+    m['module_group_name'] = name
+    return m
 
 
 def read_projects_yaml(project_list_uri):
@@ -30,10 +38,10 @@ def read_projects_yaml(project_list_uri):
     content = yaml.safe_load(utils.read_uri(project_list_uri))
     module_groups = collections.defaultdict(lambda: {'modules': []})
 
+    all_official = _make_module_group(module_groups, 'openstack-official')
+
     for tag in TAGS:
-        m = module_groups[tag]  # object created by defaultdict
-        m['tag'] = 'project_type'
-        m['module_group_name'] = tag
+        _make_module_group(module_groups, tag)
 
     for name, project in six.iteritems(content):
         group_id = '%s-group' % name.lower()
@@ -49,6 +57,8 @@ def read_projects_yaml(project_list_uri):
 
                 module_groups[group_id]['modules'].append(module_name)
 
+                all_official['modules'].append(module_name)
+
                 tags = deliverable.get('tags', [])
                 for tag in tags:
                     if tag in TAGS:
diff --git a/tests/unit/test_governance.py b/tests/unit/test_governance.py
index 34c19e302..ca77a509c 100644
--- a/tests/unit/test_governance.py
+++ b/tests/unit/test_governance.py
@@ -79,7 +79,27 @@ class TestGovernance(testtools.TestCase):
                 'module_group_name': 'tc-approved-release',
                 'modules': ['sahara', 'sahara-extra', 'sahara-image-elements'],
                 'tag': 'project_type'
-            }
+            },
+            'type:library': {
+                'id': 'type:library',
+                'module_group_name': 'type:library',
+                'modules': ['python-saharaclient', 'sahara-dashboard'],
+                'tag': 'project_type'
+            },
+            'type:service': {
+                'id': 'type:service',
+                'module_group_name': 'type:service',
+                'modules': ['sahara', 'sahara-extra', 'sahara-image-elements'],
+                'tag': 'project_type'
+            },
+            'openstack-official': {
+                'id': 'openstack-official',
+                'module_group_name': 'openstack-official',
+                'modules': ['python-saharaclient', 'sahara',
+                            'sahara-dashboard', 'sahara-extra',
+                            'sahara-image-elements', 'sahara-specs'],
+                'tag': 'project_type'
+            },
         }
 
         actual = governance.read_projects_yaml('uri')