diff --git a/services/app-integration/message/features.yaml b/services/app-integration/message/features.yaml
new file mode 100644
index 00000000..7631102f
--- /dev/null
+++ b/services/app-integration/message/features.yaml
@@ -0,0 +1,106 @@
+common_features:
+  - CCC.F01 # Encryption in Transit Enabled by Default
+  - CCC.F02 # Encryption at Rest Enabled by Default
+  - CCC.F06 # Identity-Based Access Control
+  - CCC.F07 # Event Notifications
+  - CCC.F08 # Multi-zone Deployment
+  - CCC.F09 # Monitoring
+  - CCC.F10 # Logging
+  - CCC.F13 # Infrastructure as Code
+  - CCC.F14 # API Access
+  - CCC.F19 # On-Demand Scaling
+  - CCC.F20 # Tagging
+
+features:
+  - id: CCC.Message.F01
+    title: Publish/Subscribe Model
+    description: |
+      Uses publish/subscribe (pub/sub) messaging service model for
+      fan-out distribution of messages to multiple subscribers.
+
+  - id: CCC.Message.F02
+    title: Message Storage Policies
+    description: |
+      Ability to control the region where messages are stored.
+
+  - id: CCC.Message.F03
+    title: Creating Topics and Publish Messages
+    description: |
+      Ability to create new topics and publish messages to topics
+
+  - id: CCC.Message.F04
+    title: List Topics
+    description: |
+      Ability to to list all existing topics.
+
+  - id: CCC.Message.F05
+    title: Edit Topics
+    description: |
+      Ability to to edit properties of existing topics other than
+      the topic name and ordering preference.
+
+  - id: CCC.Message.F06
+    title: Delete Topics
+    description: |
+      Ability to to delete existing topics.
+
+  - id: CCC.Message.F07
+    title: Subscribe to Topics and Receive messages
+    description: |
+      Ability to subscribe to topics and receive messages.
+
+  - id: CCC.Message.F08
+    title: List Subscribers
+    description: |
+      Ability to list all subscribers for a given topics.
+
+  - id: CCC.Message.F09
+    title: Edit Subscriber
+    description: |
+      Ability to edit subscriber properties such as subscription
+      filter policies after subscriber is created.
+
+  - id: CCC.Message.F10
+    title: Delete Subscribers
+    description: |
+      Ability to delete subscriber from a given topic.
+
+  - id: CCC.Message.F11
+    title: FIFO Message Ordering
+    description: |
+      Support for first-in, first-out strictly preserved message
+      ordering with exactly one message delivered.
+
+  - id: CCC.Message.F12
+    title: Best Effort Message Ordering
+    description: |
+      Support for best-effort message ordering with at-least one
+      message delivered.
+
+  - id: CCC.Message.F13
+    title: Deduplication of Messages
+    description: |
+      Support for deduplication of messages with use of messaging
+      service features or deduplication IDs.
+
+  - id: CCC.Message.F14
+    title: Dead Letter Topics
+    description: |
+      Supports dead-letter topics for handling messages that cannot be
+      delivered or processed.
+
+  - id: CCC.Message.F15
+    title: Access Policies
+    description: |
+      Ability to specify access policies on publishers and subscribers.
+
+  - id: CCC.Message.F16
+    title: Message Filtering
+    description: |
+      Allows subscribers to receive subset of messages published to the
+      subscribed topic based on attributes or content.
+
+  - id: CCC.Message.F17
+    title: Message Retention
+    description: |
+      Ability to set message retention durations per topic.
diff --git a/services/app-integration/service-categories.yaml b/services/app-integration/service-categories.yaml
index 7455f92b..c9bbfea1 100644
--- a/services/app-integration/service-categories.yaml
+++ b/services/app-integration/service-categories.yaml
@@ -10,8 +10,8 @@ service_categories:
     title: Messaging Services
     description: |
       Messaging services facilitate communication between distributed applications
-      and services by enabling the exchange of messages in a reliable and scalable
-      manner.
+      and services by enabling the exchange of messages using pub/sub model in
+      a reliable and scalable manner.
     examples:
       - AWS:
           - Amazon SQS (Simple Queue Service)