diff --git a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyDbContext.cs b/src/Cap.Consistency.EntityFrameworkCore/ConsistencyDbContext.cs
index ff6fd37..f2e045c 100644
--- a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyDbContext.cs
+++ b/src/Cap.Consistency.EntityFrameworkCore/ConsistencyDbContext.cs
@@ -1,4 +1,5 @@
 using System;
+using Cap.Consistency.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 
 namespace Cap.Consistency.EntityFrameworkCore
diff --git a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessage.cs b/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessage.cs
deleted file mode 100644
index 386524f..0000000
--- a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessage.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-
-namespace Cap.Consistency.EntityFrameworkCore
-{
-    /// <summary>
-    /// The default implementation of <see cref="ConsistencyMessage{TKey}"/> which uses a string as a primary key.
-    /// </summary>
-    public class ConsistencyMessage : ConsistencyMessage<string>
-    {
-        /// <summary>
-        /// Initializes a new instance of <see cref="ConsistencyMessage"/>.
-        /// </summary>
-        /// <remarks>
-        /// The Id property is initialized to from a new GUID string value.
-        /// </remarks>
-        public ConsistencyMessage() {
-            Id = Guid.NewGuid().ToString();
-            SendTime = DateTime.Now;
-            UpdateTime = SendTime;
-            Status = MessageStatus.WaitForSend;
-        }
-    }
-
-    /// <summary>
-    /// ConsistencyMessage consume status
-    /// </summary>
-    public enum MessageStatus
-    {
-        Deleted = 0,
-        WaitForSend = 1,
-        RollbackSuccessed = 3,
-        RollbackFailed = 4
-    }
-
-    /// <summary>
-    /// Represents a message in the consistency system
-    /// </summary>
-    /// <typeparam name="TKey">The type used for the primary key for the message.</typeparam>
-    public class ConsistencyMessage<TKey> where TKey : IEquatable<TKey>
-    {
-        public virtual TKey Id { get; set; }
-
-        public virtual DateTime SendTime { get; set; }
-
-        public string Payload { get; set; }
-
-        public MessageStatus Status { get; set; }
-
-        public virtual DateTime? UpdateTime { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessageStore.cs b/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessageStore.cs
index e99571f..c36bd12 100644
--- a/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessageStore.cs
+++ b/src/Cap.Consistency.EntityFrameworkCore/ConsistencyMessageStore.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
+using Cap.Consistency.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 
 namespace Cap.Consistency.EntityFrameworkCore