Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r2f9807457197c347c20a24c64492edcf063f3daa
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 2f9807457197c347c20a24c64492edcf063f3daa)
@@ -40,6 +40,18 @@
     U32 subMode;                         ///< Current sub-mode of current operating mode
 } OP_MODE_PAYLOAD_T;
 
+/// Payload structure for generic confirmation request
+typedef struct
+{
+    U32 requestID;                              ///< Generic request ID.
+    U32 requestType;                            ///< Generic request type.
+    U32 rejectReason;                           ///< Reject reason.
+    F32 genericPayload1;                        ///< Generic payload 1.
+    F32 genericPayload2;                        ///< Generic payload 2.
+    F32 genericPayload3;                        ///< Generic payload 3.
+    F32 genericPayload4;                        ///< Generic payload 4.
+} GENERIC_CONFIRMATION_REQUEST_T;
+
 // ********** public function prototypes **********
 
 void initOperationModes( void );                                    // Initialize this module
@@ -49,9 +61,12 @@
 HD_OP_MODE_T getPreviousOperationMode( void );                      // Get the previous operation mode
 U32  getCurrentSubMode( void );                                     // Get the current sub-mode
 void initiateAlarmAction( ALARM_ACTION_T action );                  // Initiate an alarm or alarm recovery action according to current op mode
-CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID );                // Get the current confirmation request status
+CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, F32 payload1,
+                                                            F32 payload2, F32 payload3, F32 payload4 );                // Get the current confirmation request status
 void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, CONFIRMATION_REQUEST_STATUS_T status );   // Set the confirmation request status
-GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason );  // Add a new confirmation request
+
+GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRMATION_REQUEST_T *request );  // Add a new confirmation request
+
 void setCurrentSubState( U32 subState );                            // Set the current substate.
 void setCurrent4thLevelState( U32 state );                          // Set the current 4th level state.
 void sendOperationStatusEvent( void );                              // Constructs and sends operation status event