diff --git a/entrypoint.go b/entrypoint.go
index 60b50ab..cb940d5 100644
--- a/entrypoint.go
+++ b/entrypoint.go
@@ -45,24 +45,25 @@ type LibDataEnum int
 
 // init accessible constant to retrieve data from the database
 const (
-	INVALID             LibDataEnum = iota
-	DATA_RESOURCE                   = tools.DATA_RESOURCE
-	PROCESSING_RESOURCE             = tools.PROCESSING_RESOURCE
-	STORAGE_RESOURCE                = tools.STORAGE_RESOURCE
-	COMPUTE_RESOURCE                = tools.COMPUTE_RESOURCE
-	WORKFLOW_RESOURCE               = tools.WORKFLOW_RESOURCE
-	WORKFLOW                        = tools.WORKFLOW
-	WORKSPACE                       = tools.WORKSPACE
-	WORKFLOW_EXECUTION              = tools.WORKFLOW_EXECUTION
-	PEER                            = tools.PEER
-	COLLABORATIVE_AREA              = tools.COLLABORATIVE_AREA
-	RULE                            = tools.RULE
-	BOOKING                         = tools.BOOKING
-	ORDER                           = tools.ORDER
-	LIVE_DATACENTER                 = tools.LIVE_DATACENTER
-	LIVE_STORAGE                    = tools.LIVE_STORAGE
-	PURCHASE_RESOURCE               = tools.PURCHASE_RESOURCE
-	NATIVE_TOOL                     = tools.NATIVE_TOOL
+	INVALID                LibDataEnum = iota
+	DATA_RESOURCE                      = tools.DATA_RESOURCE
+	PROCESSING_RESOURCE                = tools.PROCESSING_RESOURCE
+	STORAGE_RESOURCE                   = tools.STORAGE_RESOURCE
+	COMPUTE_RESOURCE                   = tools.COMPUTE_RESOURCE
+	WORKFLOW_RESOURCE                  = tools.WORKFLOW_RESOURCE
+	WORKFLOW                           = tools.WORKFLOW
+	WORKSPACE                          = tools.WORKSPACE
+	WORKFLOW_EXECUTION                 = tools.WORKFLOW_EXECUTION
+	PEER                               = tools.PEER
+	COLLABORATIVE_AREA                 = tools.COLLABORATIVE_AREA
+	RULE                               = tools.RULE
+	BOOKING                            = tools.BOOKING
+	ORDER                              = tools.ORDER
+	LIVE_DATACENTER                    = tools.LIVE_DATACENTER
+	LIVE_STORAGE                       = tools.LIVE_STORAGE
+	PURCHASE_RESOURCE                  = tools.PURCHASE_RESOURCE
+	NATIVE_TOOL                        = tools.NATIVE_TOOL
+	EXECUTION_VERIFICATION             = tools.EXECUTION_VERIFICATION
 )
 
 func GetMySelf() (*peer.Peer, error) {
diff --git a/models/models.go b/models/models.go
index f527c46..04d555e 100644
--- a/models/models.go
+++ b/models/models.go
@@ -3,6 +3,7 @@ package models
 import (
 	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/bill"
+	"cloud.o-forge.io/core/oc-lib/models/execution_verification"
 	"cloud.o-forge.io/core/oc-lib/models/live"
 	"cloud.o-forge.io/core/oc-lib/models/order"
 	"cloud.o-forge.io/core/oc-lib/models/resources/purchase_resource"
@@ -24,26 +25,27 @@ This package contains the models used in the application
 It's used to create the models dynamically
 */
 var ModelsCatalog = map[string]func() utils.DBObject{
-	tools.WORKFLOW_RESOURCE.String():   func() utils.DBObject { return &resource.WorkflowResource{} },
-	tools.DATA_RESOURCE.String():       func() utils.DBObject { return &resource.DataResource{} },
-	tools.COMPUTE_RESOURCE.String():    func() utils.DBObject { return &resource.ComputeResource{} },
-	tools.STORAGE_RESOURCE.String():    func() utils.DBObject { return &resource.StorageResource{} },
-	tools.PROCESSING_RESOURCE.String(): func() utils.DBObject { return &resource.ProcessingResource{} },
-	tools.NATIVE_TOOL.String():         func() utils.DBObject { return &resource.NativeTool{} },
-	tools.WORKFLOW.String():            func() utils.DBObject { return &w2.Workflow{} },
-	tools.WORKFLOW_EXECUTION.String():  func() utils.DBObject { return &workflow_execution.WorkflowExecution{} },
-	tools.WORKSPACE.String():           func() utils.DBObject { return &w3.Workspace{} },
-	tools.PEER.String():                func() utils.DBObject { return &peer.Peer{} },
-	tools.COLLABORATIVE_AREA.String():  func() utils.DBObject { return &collaborative_area.CollaborativeArea{} },
-	tools.RULE.String():                func() utils.DBObject { return &rule.Rule{} },
-	tools.BOOKING.String():             func() utils.DBObject { return &booking.Booking{} },
-	tools.WORKFLOW_HISTORY.String():    func() utils.DBObject { return &w2.WorkflowHistory{} },
-	tools.WORKSPACE_HISTORY.String():   func() utils.DBObject { return &w3.WorkspaceHistory{} },
-	tools.ORDER.String():               func() utils.DBObject { return &order.Order{} },
-	tools.PURCHASE_RESOURCE.String():   func() utils.DBObject { return &purchase_resource.PurchaseResource{} },
-	tools.LIVE_DATACENTER.String():     func() utils.DBObject { return &live.LiveDatacenter{} },
-	tools.LIVE_STORAGE.String():        func() utils.DBObject { return &live.LiveStorage{} },
-	tools.BILL.String():                func() utils.DBObject { return &bill.Bill{} },
+	tools.WORKFLOW_RESOURCE.String():      func() utils.DBObject { return &resource.WorkflowResource{} },
+	tools.DATA_RESOURCE.String():          func() utils.DBObject { return &resource.DataResource{} },
+	tools.COMPUTE_RESOURCE.String():       func() utils.DBObject { return &resource.ComputeResource{} },
+	tools.STORAGE_RESOURCE.String():       func() utils.DBObject { return &resource.StorageResource{} },
+	tools.PROCESSING_RESOURCE.String():    func() utils.DBObject { return &resource.ProcessingResource{} },
+	tools.NATIVE_TOOL.String():            func() utils.DBObject { return &resource.NativeTool{} },
+	tools.WORKFLOW.String():               func() utils.DBObject { return &w2.Workflow{} },
+	tools.WORKFLOW_EXECUTION.String():     func() utils.DBObject { return &workflow_execution.WorkflowExecution{} },
+	tools.WORKSPACE.String():              func() utils.DBObject { return &w3.Workspace{} },
+	tools.PEER.String():                   func() utils.DBObject { return &peer.Peer{} },
+	tools.COLLABORATIVE_AREA.String():     func() utils.DBObject { return &collaborative_area.CollaborativeArea{} },
+	tools.RULE.String():                   func() utils.DBObject { return &rule.Rule{} },
+	tools.BOOKING.String():                func() utils.DBObject { return &booking.Booking{} },
+	tools.WORKFLOW_HISTORY.String():       func() utils.DBObject { return &w2.WorkflowHistory{} },
+	tools.WORKSPACE_HISTORY.String():      func() utils.DBObject { return &w3.WorkspaceHistory{} },
+	tools.ORDER.String():                  func() utils.DBObject { return &order.Order{} },
+	tools.PURCHASE_RESOURCE.String():      func() utils.DBObject { return &purchase_resource.PurchaseResource{} },
+	tools.LIVE_DATACENTER.String():        func() utils.DBObject { return &live.LiveDatacenter{} },
+	tools.LIVE_STORAGE.String():           func() utils.DBObject { return &live.LiveStorage{} },
+	tools.BILL.String():                   func() utils.DBObject { return &bill.Bill{} },
+	tools.EXECUTION_VERIFICATION.String(): func() utils.DBObject { return &execution_verification.ExecutionVerification{} },
 }
 
 // Model returns the model object based on the model type
diff --git a/tools/enums.go b/tools/enums.go
index f2d6b86..4416ee4 100644
--- a/tools/enums.go
+++ b/tools/enums.go
@@ -31,6 +31,7 @@ const (
 	LIVE_STORAGE
 	BILL
 	NATIVE_TOOL
+	EXECUTION_VERIFICATION
 )
 
 var NOAPI = func() string {
@@ -81,6 +82,7 @@ var InnerDefaultAPI = [...]func() string{
 	DATACENTERAPI,
 	NOAPI,
 	CATALOGAPI,
+	DATACENTERAPI,
 }
 
 // Bind the standard data name to the data type
@@ -106,6 +108,7 @@ var Str = [...]string{
 	"live_storage",
 	"bill",
 	"native_tool",
+	"execution_verification",
 }
 
 func FromString(comp string) int {