--- a/phoneapp/phoneuicontrol/inc/cphonestatemachine.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestatemachine.h	Wed Sep 01 12:30:10 2010 +0100
@@ -30,7 +30,8 @@
 
 // FORWARD DECLARATIONS
 class MPhoneState;
-class MPhoneStorage;
+class MPhoneSecurityModeObserver;
+class MPhoneSecurityMessageHandler;
 
 // CLASS DECLARATION
 
@@ -101,12 +102,53 @@
         */    
         IMPORT_C void SetCallId( const TInt aCallId );
 
-       
+   
+        /**
+         * Getter for security mode observer interface.
+         * 
+         * @return Pointer to security mode interface.
+         */
+        IMPORT_C MPhoneSecurityModeObserver* SecurityMode();
+        
+		/**
+		 * Setter for security mode observer interface.
+		 *
+		 * @param aObserver Pointer to observer interface.
+		 */
+		IMPORT_C void SetSecurityModeObserver( MPhoneSecurityModeObserver* aObserver );
+
+		/**
+		 * Set security message handler for security message observations.
+		 * 
+		 * @param aHandler Pointer to handler instance. 
+		 */
+		IMPORT_C void SetSecurityMessageHandler( MPhoneSecurityMessageHandler* aHandler );
+		
         /**
-        * Instantiates phone storage.
-        * @return storage instance    
-        */    
-        IMPORT_C MPhoneStorage* PhoneStorage();        
+         * Handle phone engine message.
+         * 
+         * @param aMessage Message
+         * @param aCallId Call id
+         */
+        IMPORT_C void HandlePhoneEngineMessageL(const TInt aMessage, 
+             	TInt aCallId );
+        
+        /**
+          * This function is called when there is property value change.
+          * @param aCategory Category of the property
+          * @param aKey Property key that is changed
+          * @param aValue New property value
+          */
+         IMPORT_C void HandlePropertyChangedL(const TUid& aCategory,
+         	const TUint aKey,
+         	const TInt aValue );
+         
+         /**
+           * Getter for CEikonEnv to avoid use of static system calls
+           * @return CEikonEnv handle
+           */
+          IMPORT_C CEikonEnv* EikonEnv() const;
+         
 
     protected:
 
@@ -145,9 +187,24 @@
 
         // Idle state which is hold in memory all the time
         MPhoneState* iIdleState;
-
-        // Phone's storage
-        MPhoneStorage* iPhoneStorage;
+        
+        /**
+         * Security mode state
+         * Not own.
+         */
+        MPhoneSecurityModeObserver* iSecurityModeObserver;
+        
+        /**
+         * Security message handling interface.
+         * Not own.
+         */
+        MPhoneSecurityMessageHandler* iSecurityMessageHandler;
+        
+        /** Internal variable for EikonEnv to avoid use of static system calls
+         * Not own.
+         */
+        CEikonEnv* iEnv;
+        
     };
 
 #endif      // CPHONESTATEMACHINE_H