diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb
index 7838811d..540e2cd0 100644
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@@ -14,7 +14,7 @@
         Created = 0
     End Enum
 
-    Public Enum HistoryStatus
+    Public Enum ActionType
         Created = 0
     End Enum
 
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
index 1642491b..0814c9be 100644
--- a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
+++ b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
@@ -1,10 +1,9 @@
 Public Class EnvelopeHistoryEntry
     Public EnvelopeId As Integer
-    Public Status As Constants.HistoryStatus
-    Public UserEmailAddress As String
-    Public ActionTitle As String
+    Public ActionType As Constants.ActionType
+    Public UserReference As String
     Public ActionDescription As String
-    Public AddedWhen As Date
+    Public ActionDate As DateTime
 
 
 End Class
diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
index 5cef3e07..a8d06760 100644
--- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
+++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
@@ -107,6 +107,7 @@
     <Compile Include="Entities\User.vb" />
     <Compile Include="Helpers.vb" />
     <Compile Include="Models\BaseModel.vb" />
+    <Compile Include="Models\CertificateModel.vb" />
     <Compile Include="Models\ConfigModel.vb" />
     <Compile Include="Models\DocumentModel.vb" />
     <Compile Include="Models\ElementModel.vb" />
diff --git a/EnvelopeGenerator.Common/Models/CertificateModel.vb b/EnvelopeGenerator.Common/Models/CertificateModel.vb
new file mode 100644
index 00000000..33a462c2
--- /dev/null
+++ b/EnvelopeGenerator.Common/Models/CertificateModel.vb
@@ -0,0 +1,50 @@
+Imports System.Data.SqlClient
+
+
+
+Public Class CertificateModel
+    Inherits BaseModel
+
+    Public Sub New(pState As State)
+        MyBase.New(pState)
+    End Sub
+
+    Public Function Insert(pEnvelope As Envelope) As Boolean
+        Try
+            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_CERTIFICATE] "
+            oSql += "   ([ENVELOPE_ID] "
+            oSql += "   ,[ENVELOPE_UUID]"
+            oSql += "   ,[ENVELOPE_SUBJECT]"
+            oSql += "   ,[CREATOR_ID]"
+            oSql += "   ,[CREATOR_NAME]"
+            oSql += "   ,[CREATOR_EMAIL]"
+            oSql += "   ,[ENVELOPE_STATUS])"
+            oSql += " VALUES "
+            oSql += "   (@ENVELOPE_ID "
+            oSql += "   ,@ENVELOPE_UUID"
+            oSql += "   ,@ENVELOPE_SUBJECT"
+            oSql += "   ,@CREATOR_ID"
+            oSql += "   ,@CREATOR_NAME"
+            oSql += "   ,@CREATOR_EMAIL"
+            oSql += "   ,@ENVELOPE_STATUS)"
+
+            Dim oCommand As New SqlCommand(oSql)
+            oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
+            oCommand.Parameters.Add("ENVELOPE_UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
+            oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject
+            oCommand.Parameters.Add("CREATOR_ID", SqlDbType.Int).Value = pEnvelope.UserId
+            oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.FullName
+            oCommand.Parameters.Add("CREATOR_EMAIL", SqlDbType.NVarChar).Value = pEnvelope.User.Email
+            oCommand.Parameters.Add("ENVELOPE_STATUS", SqlDbType.NVarChar).Value = pEnvelope.Status
+
+            If Database.ExecuteNonQuery(oCommand) Then
+                Return True
+            Else
+                Return False
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+End Class
diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb
index a8761b10..9d000b89 100644
--- a/EnvelopeGenerator.Common/Models/HistoryModel.vb
+++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb
@@ -9,25 +9,25 @@ Public Class HistoryModel
 
     Public Function Insert(pHistory As EnvelopeHistoryEntry) As Boolean
         Try
-            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_HISTORY]
-               ([ENVELOPE_ID]
-               ,[STATUS]
-               ,[USER_EMAIL_ADDRESS]
-               ,[ACTION_TITLE]
-               ,[ACTION_DESCRIPTION])
-            VALUES
-               (@ENVELOPE_ID
-               ,@STATUS
-               ,@EMAIL
-               ,@TITLE
-               ,@DESCRIPTION"
+            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_HISTORY] "
+            oSql += "   ([ENVELOPE_ID] "
+            oSql += "   ,[USER_REFERENCE] "
+            oSql += "   ,[ACTION_TYPE] "
+            oSql += "   ,[ACTION_DESCRIPTION] "
+            oSql += "   ,[ACTION_DATE]) "
+            oSql += " VALUES "
+            oSql += "   (@ENVELOPE_ID "
+            oSql += "   ,@USER_REFERENCE "
+            oSql += "   ,@ACTION_TYPE "
+            oSql += "   ,@ACTION_DESCRIPTION) "
+            oSql += "   ,@ACTION_DATE) "
 
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pHistory.EnvelopeId
-            oCommand.Parameters.Add("STATUS", SqlDbType.NVarChar).Value = pHistory.Status
-            oCommand.Parameters.Add("EMAIL", SqlDbType.NVarChar).Value = pHistory.UserEmailAddress
-            oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pHistory.ActionTitle
-            oCommand.Parameters.Add("DESCRIPTION", SqlDbType.NVarChar).Value = pHistory.ActionDescription
+            oCommand.Parameters.Add("USER_REFERENCE", SqlDbType.NVarChar).Value = pHistory.UserEmailAddress
+            oCommand.Parameters.Add("ACTION_TYPE", SqlDbType.NVarChar).Value = pHistory
+            oCommand.Parameters.Add("ACTION_DESCRIPTION", SqlDbType.NVarChar).Value = pHistory.ActionDescription
+            oCommand.Parameters.Add("ACTION_DATE", SqlDbType.DateTime).Value = pHistory
 
             If Database.ExecuteNonQuery(oCommand) Then
                 Return True