--- a/sat_pubsub/backend.py	Wed Nov 25 16:00:08 2015 +0100
+++ b/sat_pubsub/backend.py	Wed Nov 25 18:33:38 2015 +0100
@@ -81,6 +81,10 @@
 from sat_pubsub.iidavoll import IBackendService, ILeafNode
 
 from copy import deepcopy
+from collections import namedtuple
+
+
+ItemData = namedtuple('ItemData', ('item', 'access_model', 'config', 'categories'))
 
 
 def _getAffiliation(node, entity):
@@ -245,7 +249,9 @@
 
     def parseItemConfig(self, item):
         """Get and remove item configuration information
-        @param item:
+
+        @param item (domish.Element): item to parse
+        @return (tuple[unicode, dict)): (access_model, item_config)
         """
         item_config = None
         access_model = const.VAL_AMODEL_DEFAULT
@@ -262,6 +268,25 @@
             access_model = item_config.get(const.OPT_ACCESS_MODEL, const.VAL_AMODEL_DEFAULT)
         return (access_model, item_config)
 
+    def parseCategories(self, item_elt):
+        """Check if item contain an atom entry, and parse categories if possible
+
+        @param item (domish.Element): item to parse
+        @return (list): list of found categories
+        """
+        categories = []
+        try:
+            entry_elt = item_elt.elements(const.NS_ATOM, "entry").next()
+        except StopIteration:
+            return categories
+
+        for category_elt in entry_elt.elements(const.NS_ATOM, 'category'):
+            category = category_elt.getAttribute('term')
+            if category:
+                categories.append(category)
+
+        return categories
+
     def _checkOverwrite(self, node, itemIdentifiers, publisher):
         """Check that the itemIdentifiers correspond to items published
         by the current publisher"""
@@ -311,7 +336,8 @@
                 else:
                     check_overwrite = True
             access_model, item_config = self.parseItemConfig(item)
-            items_data.append((item, access_model, item_config))
+            categories = self.parseCategories(item)
+            items_data.append(ItemData(item, access_model, item_config, categories))
 
         if persistItems:
             if check_overwrite and affiliation != 'owner':
@@ -331,8 +357,8 @@
 
     def _doNotify(self, result, node, items_data, deliverPayloads, pep, recipient):
         if items_data and not deliverPayloads:
-            for access_model, item_config, item in items_data:
-                item.children = []
+            for item_data in items_data:
+                item_data.item.children = []
         self.dispatch({'items_data': items_data, 'node': node, 'pep': pep, 'recipient': recipient},
                       '//event/pubsub/notify')
 
@@ -575,8 +601,7 @@
 
         def append_item_config(items_data):
             ret = []
-            for data in items_data:
-                item, access_model, access_list = data
+            for item, access_model, access_list in items_data:
                 if access_model == const.VAL_AMODEL_OPEN:
                     pass
                 elif access_model == const.VAL_AMODEL_ROSTER:
@@ -736,7 +761,7 @@
         def removeItems(items_data):
             """Remove the items and keep only actually removed ones in items_data"""
             d = node.removeItems(itemIdentifiers)
-            d.addCallback(lambda removed: [item_data for item_data in items_data if item_data[0]["id"] in removed])
+            d.addCallback(lambda removed: [item_data for item_data in items_data if item_data.item["id"] in removed])
             return d
 
         d = node.getItemsById(None, True, itemIdentifiers)
@@ -945,7 +970,7 @@
                 """
                 #TODO: a test should check that only the owner get the item configuration back
 
-                item, access_model, item_config = item_data
+                item, item_config = item_data.item, item_data.config
                 new_item = deepcopy(item)
                 if item_config:
                     new_item.addChild(item_config.toElement())
@@ -1031,14 +1056,16 @@
             #we filter items not allowed for the subscribers
             notifications_filtered = []
 
-            for subscriber, subscriptions, _items_data in notifications:
+            for subscriber, subscriptions, items_data in notifications:
                 if subscriber == owner_jid:
                     # as notification is always sent to owner,
                     # we ignore owner if he is here
                     continue
                 allowed_items = [] #we keep only item which subscriber can access
 
-                for item, access_model, access_list in _items_data:
+                for item_data in items_data:
+                    item, access_model = item_data.item, item_data.access_model
+                    access_list = item_data.config
                     if access_model == const.VAL_AMODEL_OPEN:
                         allowed_items.append(item)
                     elif access_model == const.VAL_AMODEL_ROSTER: