diff -r bab96b7ed1a4 -r f39ed5e045e0 phoneengine/phonemodel/inc/cpeparsersshandler.h
--- a/phoneengine/phonemodel/inc/cpeparsersshandler.h	Tue Jun 15 14:14:38 2010 +0100
+++ b/phoneengine/phonemodel/inc/cpeparsersshandler.h	Thu Jul 22 16:33:21 2010 +0100
@@ -40,6 +40,12 @@
 class CPsuiDivertObs;
 class CPsuiCliObserver;
 
+class PSetCallDivertingWrapper;
+class PSetCallWaitingWrapper;
+class PSetWrapper;
+class PsUiDivertNoteHandler;
+class PsUiWaitingNoteHandler;
+
 // CLASS DECLARATION
 
 /**
@@ -277,23 +283,34 @@
         CPsetContainer* iSettings;
         // Owned phone settings ui container.
         CPsuiContainer* iObsContainer;
-        // Owned call waiting.
-        CPsetCallWaiting* iWaiting;
-        // Owned waiting observer.
-        CPsuiWaitingObs* iCwObserver;
+       
         // Owned call barring.
         CPsetCallBarring* iBarring;
         // Owned call barring observer.
-        CPsuiBarringObs* iCbObserver;
-        // Owned call diverting.
-        CPsetCallDiverting* iDivert;
-        // Owned call diverting observer.
-        CPsuiDivertObs* iCfObserver;
+        CPsuiBarringObs* iCbObserver;    
+    
         // Owned calling line identity.
         CPsetCli* iCli;
         // Owned calling line identity observer.
         CPsuiCliObserver* iCliObserver;
+        
+        
+        // Call diverting. Not own.
+        CPsetCallDiverting* iDivert;  
+        // Call divert wrapper. Not own
+        PSetCallDivertingWrapper* iCallDivertingWrapper;
+        // Call diverting note handler, Own
+        PsUiDivertNoteHandler* iCallDivertingHandler;
+      
+        // Owned call waiting. Now Own
+        CPsetCallWaiting* iWaiting;
+        // Call divert wrapper. Not own
+        PSetCallWaitingWrapper* iCallWaitingWrapper;
+        // Call diverting note handler, Own
+        PsUiWaitingNoteHandler* iCallWaitingHandler;
 
+        // Setting wrappers. Own. 
+        PSetWrapper *iPsetWrapper;  
     };
 
 #endif      // CPEPARSERSSHANDLER_H