diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 7539b04..4096c65 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Build
       run: dotnet build --no-restore NetCorePal.Template.csproj
     - name: Test
-      run: dotnet test --no-build --verbosity normal NetCorePal.Template.csproj
+      run: dotnet test --verbosity normal template/ABC.Template.sln
     - name: Pack NuGet
       run: dotnet pack -c Release --version-suffix alpha`date +%y%m%d%H%M` -o "./" NetCorePal.Template.csproj 
     - name: Push NuGet
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c1fecdd..7bfce41 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Build
       run: dotnet build --no-restore NetCorePal.Template.csproj
     - name: Test
-      run: dotnet test --no-build --verbosity normal NetCorePal.Template.csproj
+      run: dotnet test --verbosity normal template/ABC.Template.sln
     - name: Pack NuGet
       run: dotnet pack -c Release -o "./" NetCorePal.Template.csproj 
     - name: Push NuGet
diff --git a/eng/versions.props b/eng/versions.props
index bccd397..95b9aa1 100644
--- a/eng/versions.props
+++ b/eng/versions.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.5.1</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/template/Directory.Build.targets b/template/Directory.Build.targets
index 1c952ac..6cbffec 100644
--- a/template/Directory.Build.targets
+++ b/template/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <NetCorePalVersion>2.0.0-preview.1.2409021337</NetCorePalVersion>
+    <NetCorePalVersion>2.0.0-preview.1.2409071627</NetCorePalVersion>
     <FrameworkVersion>8.0.0</FrameworkVersion>
     <ExtensionsVersion>8.0.0</ExtensionsVersion>
     <EntityFrameworkVersion>8.0.0</EntityFrameworkVersion>
diff --git a/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommand.cs b/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommand.cs
index bb22c9b..d38e32d 100644
--- a/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommand.cs
+++ b/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommand.cs
@@ -1,6 +1,7 @@
-using NetCorePal.Extensions.Primitives;
+using ABC.Template.Domain.AggregatesModel.OrderAggregate;
+using NetCorePal.Extensions.Primitives;
 
 namespace ABC.Template.Web.Application.Commands
 {
-    public record class OrderPaidCommand(long OrderId) : ICommand;
+    public record class OrderPaidCommand(OrderId OrderId) : ICommand;
 }
diff --git a/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommandHandler.cs b/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommandHandler.cs
index 6e0cdf3..86244aa 100644
--- a/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommandHandler.cs
+++ b/template/src/ABC.Template.Web/Application/Commands/OrderPaidCommandHandler.cs
@@ -1,4 +1,5 @@
-using ABC.Template.Infrastructure.Repositories;
+using ABC.Template.Domain.AggregatesModel.OrderAggregate;
+using ABC.Template.Infrastructure.Repositories;
 using NetCorePal.Extensions.Primitives;
 
 namespace ABC.Template.Web.Application.Commands
diff --git a/template/src/ABC.Template.Web/Controllers/DemoController.cs b/template/src/ABC.Template.Web/Controllers/DemoController.cs
index 68cb1be..b560d93 100644
--- a/template/src/ABC.Template.Web/Controllers/DemoController.cs
+++ b/template/src/ABC.Template.Web/Controllers/DemoController.cs
@@ -1,4 +1,5 @@
-using ABC.Template.Web.Application.IntegrationEventHandlers;
+using ABC.Template.Domain.AggregatesModel.OrderAggregate;
+using ABC.Template.Web.Application.IntegrationEventHandlers;
 using FluentValidation;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -33,7 +34,7 @@ public Task<ResponseData> Validator(ValidatorRequest request)
         [Route("event")]
         public async Task<ResponseData<long>> Event([FromServices] IIntegrationEventPublisher publisher)
         {
-            await publisher.PublishAsync(new OrderPaidIntegrationEvent(55));
+            await publisher.PublishAsync(new OrderPaidIntegrationEvent(new OrderId(55)));
             return 55L.AsResponseData();
         }
 
diff --git a/template/test/ABC.Template.Web.Tests/DemoTests.cs b/template/test/ABC.Template.Web.Tests/DemoTests.cs
index f079cd2..bb5c693 100644
--- a/template/test/ABC.Template.Web.Tests/DemoTests.cs
+++ b/template/test/ABC.Template.Web.Tests/DemoTests.cs
@@ -73,7 +73,7 @@ public async Task Json_ReadFromJson_Test()
             Assert.NotNull(responseData);
             Assert.Equal(DateTime.Parse("2021-08-31 15:00:00"), responseData.Data.Time);
             Assert.Equal("myName", responseData.Data.Name);
-            Assert.Equal(5, responseData.Data.Id);
+            Assert.Equal(5, responseData.Data.Id.Id);
         }
 
         [Fact]