--- a/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpnotificationhandler.h	Tue Apr 27 16:57:49 2010 +0300
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpnotificationhandler.h	Tue May 11 16:30:05 2010 +0300
@@ -41,13 +41,13 @@
      * Two-phased constructor.
      */
     static CCPNotificationHandler* NewL( RPointerArray<CLiwDefaultList>&
-        aNotifications );
+        aNotifications, TLiwVariant& aDataMapCache );
 
     /**
      * Two-phased constructor.
      */
     static CCPNotificationHandler* NewLC( RPointerArray<CLiwDefaultList>&
-        aNotifications );
+        aNotifications, TLiwVariant& aDataMapCache );
 
     /**
      * Destructor.
@@ -97,12 +97,12 @@
     /**
      * C++ default constructor.
      */
-    CCPNotificationHandler();
+    CCPNotificationHandler(TLiwVariant& aDataMapCache);
 
     /**
      * By default Symbian 2nd phase constructor is private.
      */
-    void ConstructL( RPointerArray<CLiwDefaultList>& aNotifications );
+    void ConstructL(RPointerArray<CLiwDefaultList>& aNotifications);
 
     /**
      * Invoked in order to send notification
@@ -202,6 +202,18 @@
      * Filters
      */
     RHashMap< TInt32, CCPLiwMap*> iFilters;
+
+    
+    /*
+     * Own.
+     * Filters
+     */
+    RHashMap< TInt32, TBool> iExtendedFlags;
+
+    /*
+     * Not Own.
+     */
+    TLiwVariant& iDataMapCache;
     };
 
 #endif // C_CPNOTIFICATIONHANDLER_H