feat(eventstore): increase parallel write capabilities (#5940)

This implementation increases parallel write capabilities of the eventstore.
Please have a look at the technical advisories: [05](https://zitadel.com/docs/support/advisory/a10005) and  [06](https://zitadel.com/docs/support/advisory/a10006).
The implementation of eventstore.push is rewritten and stored events are migrated to a new table `eventstore.events2`.
If you are using cockroach: make sure that the database user of ZITADEL has `VIEWACTIVITY` grant. This is used to query events.

internal/repository/action/action.go

@@ -2,12 +2,10 @@ package action
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -20,15 +18,15 @@ const (
 	RemovedEventType     = eventTypePrefix + "removed"
 )
 
-func NewAddActionNameUniqueConstraint(actionName, resourceOwner string) *eventstore.EventUniqueConstraint {
+func NewAddActionNameUniqueConstraint(actionName, resourceOwner string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueActionNameType,
 		actionName+":"+resourceOwner,
 		"Errors.Action.AlreadyExists")
 }
 
-func NewRemoveActionNameUniqueConstraint(actionName, resourceOwner string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveActionNameUniqueConstraint(actionName, resourceOwner string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueActionNameType,
 		actionName+":"+resourceOwner)
 }
@@ -42,12 +40,12 @@ type AddedEvent struct {
 	AllowedToFail bool          `json:"allowedToFail"`
 }
 
-func (e *AddedEvent) Data() interface{} {
+func (e *AddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddActionNameUniqueConstraint(e.Name, e.Aggregate().ResourceOwner)}
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddActionNameUniqueConstraint(e.Name, e.Aggregate().ResourceOwner)}
 }
 
 func NewAddedEvent(
@@ -71,12 +69,12 @@ func NewAddedEvent(
 	}
 }
 
-func AddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action added")
 	}
@@ -94,15 +92,15 @@ type ChangedEvent struct {
 	oldName       string
 }
 
-func (e *ChangedEvent) Data() interface{} {
+func (e *ChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	if e.oldName == "" {
 		return nil
 	}
-	return []*eventstore.EventUniqueConstraint{
+	return []*eventstore.UniqueConstraint{
 		NewRemoveActionNameUniqueConstraint(e.oldName, e.Aggregate().ResourceOwner),
 		NewAddActionNameUniqueConstraint(*e.Name, e.Aggregate().ResourceOwner),
 	}
@@ -156,12 +154,12 @@ func ChangeAllowedToFail(allowedToFail bool) func(event *ChangedEvent) {
 	}
 }
 
-func ChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action changed")
 	}
@@ -173,11 +171,11 @@ type DeactivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *DeactivatedEvent) Data() interface{} {
+func (e *DeactivatedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *DeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -191,7 +189,7 @@ func NewDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *
 	}
 }
 
-func DeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &DeactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -201,11 +199,11 @@ type ReactivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *ReactivatedEvent) Data() interface{} {
+func (e *ReactivatedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *ReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -219,7 +217,7 @@ func NewReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *
 	}
 }
 
-func ReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &ReactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -231,12 +229,12 @@ type RemovedEvent struct {
 	name string
 }
 
-func (e *RemovedEvent) Data() interface{} {
+func (e *RemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveActionNameUniqueConstraint(e.name, e.Aggregate().ResourceOwner)}
+func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveActionNameUniqueConstraint(e.name, e.Aggregate().ResourceOwner)}
 }
 
 func NewRemovedEvent(
@@ -254,7 +252,7 @@ func NewRemovedEvent(
 	}
 }
 
-func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &RemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/asset/asset.go

@@ -1,11 +1,8 @@
 package asset
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -19,11 +16,11 @@ type AddedEvent struct {
 	StoreKey string `json:"storeKey"`
 }
 
-func (e *AddedEvent) Data() interface{} {
+func (e *AddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -38,12 +35,12 @@ func NewAddedEvent(
 	}
 }
 
-func AddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ASSET-1WEAx", "unable to unmarshal asset")
 	}
@@ -57,11 +54,11 @@ type RemovedEvent struct {
 	StoreKey string `json:"storeKey"`
 }
 
-func (e *RemovedEvent) Data() interface{} {
+func (e *RemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -76,12 +73,12 @@ func NewRemovedEvent(
 	}
 }
 
-func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &RemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ASSET-1m9PP", "unable to unmarshal asset")
 	}

internal/repository/authrequest/auth_request.go

@@ -2,13 +2,11 @@ package authrequest
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -40,11 +38,11 @@ type AddedEvent struct {
 	HintUserID    *string                   `json:"hint_user_id,omitempty"`
 }
 
-func (e *AddedEvent) Data() interface{} {
+func (e *AddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -88,11 +86,11 @@ func NewAddedEvent(ctx context.Context,
 	}
 }
 
-func AddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	added := &AddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, added)
+	err := event.Unmarshal(added)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "AUTHR-DG4gn", "unable to unmarshal auth request added")
 	}
@@ -109,11 +107,11 @@ type SessionLinkedEvent struct {
 	AuthMethods []domain.UserAuthMethodType `json:"auth_methods"`
 }
 
-func (e *SessionLinkedEvent) Data() interface{} {
+func (e *SessionLinkedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SessionLinkedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SessionLinkedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -137,11 +135,11 @@ func NewSessionLinkedEvent(ctx context.Context,
 	}
 }
 
-func SessionLinkedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SessionLinkedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	added := &SessionLinkedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, added)
+	err := event.Unmarshal(added)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked")
 	}
@@ -155,11 +153,11 @@ type FailedEvent struct {
 	Reason domain.OIDCErrorReason `json:"reason,omitempty"`
 }
 
-func (e *FailedEvent) Data() interface{} {
+func (e *FailedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *FailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *FailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -178,11 +176,11 @@ func NewFailedEvent(
 	}
 }
 
-func FailedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func FailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	added := &FailedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, added)
+	err := event.Unmarshal(added)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked")
 	}
@@ -194,11 +192,11 @@ type CodeAddedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *CodeAddedEvent) Data() interface{} {
+func (e *CodeAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *CodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -214,11 +212,11 @@ func NewCodeAddedEvent(ctx context.Context,
 	}
 }
 
-func CodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	added := &CodeAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, added)
+	err := event.Unmarshal(added)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request code added")
 	}
@@ -230,11 +228,11 @@ type CodeExchangedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *CodeExchangedEvent) Data() interface{} {
+func (e *CodeExchangedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *CodeExchangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CodeExchangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -250,7 +248,7 @@ func NewCodeExchangedEvent(ctx context.Context,
 	}
 }
 
-func CodeExchangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CodeExchangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &CodeExchangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -260,11 +258,11 @@ type SucceededEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *SucceededEvent) Data() interface{} {
+func (e *SucceededEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *SucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -280,7 +278,7 @@ func NewSucceededEvent(ctx context.Context,
 	}
 }
 
-func SucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &SucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/deviceauth/constraints.go

@@ -17,8 +17,8 @@ func deviceCodeUniqueField(clientID, deviceCode string) string {
 	return strings.Join([]string{clientID, deviceCode}, ":")
 }
 
-func NewAddUniqueConstraints(clientID, deviceCode, userCode string) []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{
+func NewAddUniqueConstraints(clientID, deviceCode, userCode string) []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{
 		eventstore.NewAddEventUniqueConstraint(
 			UniqueDeviceCode,
 			deviceCodeUniqueField(clientID, deviceCode),
@@ -32,13 +32,13 @@ func NewAddUniqueConstraints(clientID, deviceCode, userCode string) []*eventstor
 	}
 }
 
-func NewRemoveUniqueConstraints(clientID, deviceCode, userCode string) []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{
-		eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveUniqueConstraints(clientID, deviceCode, userCode string) []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{
+		eventstore.NewRemoveUniqueConstraint(
 			UniqueDeviceCode,
 			deviceCodeUniqueField(clientID, deviceCode),
 		),
-		eventstore.NewRemoveEventUniqueConstraint(
+		eventstore.NewRemoveUniqueConstraint(
 			UniqueUserCode,
 			userCode,
 		),

internal/repository/deviceauth/device_auth.go

@@ -31,11 +31,11 @@ func (e *AddedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
 	e.BaseEvent = b
 }
 
-func (e *AddedEvent) Data() any {
+func (e *AddedEvent) Payload() any {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return NewAddUniqueConstraints(e.ClientID, e.DeviceCode, e.UserCode)
 }
 
@@ -65,11 +65,11 @@ func (e *ApprovedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
 	e.BaseEvent = b
 }
 
-func (e *ApprovedEvent) Data() any {
+func (e *ApprovedEvent) Payload() any {
 	return e
 }
 
-func (e *ApprovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ApprovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -95,11 +95,11 @@ func (e *CanceledEvent) SetBaseEvent(b *eventstore.BaseEvent) {
 	e.BaseEvent = b
 }
 
-func (e *CanceledEvent) Data() any {
+func (e *CanceledEvent) Payload() any {
 	return e
 }
 
-func (e *CanceledEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CanceledEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -119,11 +119,11 @@ func (e *RemovedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
 	e.BaseEvent = b
 }
 
-func (e *RemovedEvent) Data() any {
+func (e *RemovedEvent) Payload() any {
 	return e
 }
 
-func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return NewRemoveUniqueConstraints(e.ClientID, e.DeviceCode, e.UserCode)
 }
 

internal/repository/feature/feature.go

@@ -26,11 +26,11 @@ func (e *SetEvent[T]) SetBaseEvent(b *eventstore.BaseEvent) {
 	e.BaseEvent = b
 }
 
-func (e *SetEvent[T]) Data() interface{} {
+func (e *SetEvent[T]) Payload() interface{} {
 	return e
 }
 
-func (e *SetEvent[T]) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SetEvent[T]) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 

internal/repository/flow/flow.go

@@ -1,12 +1,9 @@
 package flow
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -25,11 +22,11 @@ type TriggerActionsSetEvent struct {
 	ActionIDs   []string           `json:"actionIDs"`
 }
 
-func (e *TriggerActionsSetEvent) Data() interface{} {
+func (e *TriggerActionsSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *TriggerActionsSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *TriggerActionsSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -47,12 +44,12 @@ func NewTriggerActionsSetEvent(
 	}
 }
 
-func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func TriggerActionsSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &TriggerActionsSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions")
 	}
@@ -68,11 +65,11 @@ type TriggerActionsCascadeRemovedEvent struct {
 	ActionID    string             `json:"actionID"`
 }
 
-func (e *TriggerActionsCascadeRemovedEvent) Data() interface{} {
+func (e *TriggerActionsCascadeRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *TriggerActionsCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *TriggerActionsCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -88,12 +85,12 @@ func NewTriggerActionsCascadeRemovedEvent(
 	}
 }
 
-func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func TriggerActionsCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &TriggerActionsCascadeRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions")
 	}
@@ -107,11 +104,11 @@ type FlowClearedEvent struct {
 	FlowType domain.FlowType `json:"flowType"`
 }
 
-func (e *FlowClearedEvent) Data() interface{} {
+func (e *FlowClearedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *FlowClearedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *FlowClearedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -125,12 +122,12 @@ func NewFlowClearedEvent(
 	}
 }
 
-func FlowClearedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func FlowClearedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &FlowClearedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "FLOW-BHfg2", "unable to unmarshal flow cleared")
 	}

internal/repository/idp/apple.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type AppleIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewAppleIDPAddedEvent(
 	}
 }
 
-func (e *AppleIDPAddedEvent) Data() interface{} {
+func (e *AppleIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AppleIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AppleIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func AppleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AppleIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Beqss", "unable to unmarshal event")
 	}
@@ -142,20 +139,20 @@ func ChangeAppleOptions(options OptionChanges) func(*AppleIDPChangedEvent) {
 	}
 }
 
-func (e *AppleIDPChangedEvent) Data() interface{} {
+func (e *AppleIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AppleIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AppleIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func AppleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AppleIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-NBe1s", "unable to unmarshal event")
 	}

internal/repository/idp/azuread.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type AzureADIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewAzureADIDPAddedEvent(
 	}
 }
 
-func (e *AzureADIDPAddedEvent) Data() interface{} {
+func (e *AzureADIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AzureADIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AzureADIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func AzureADIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AzureADIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Grh2g", "unable to unmarshal event")
 	}
@@ -142,20 +139,20 @@ func ChangeAzureADIsEmailVerified(isEmailVerified bool) func(*AzureADIDPChangedE
 	}
 }
 
-func (e *AzureADIDPChangedEvent) Data() interface{} {
+func (e *AzureADIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AzureADIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AzureADIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func AzureADIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AzureADIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
 	}

internal/repository/idp/github.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type GitHubIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGitHubIDPAddedEvent(
 	}
 }
 
-func (e *GitHubIDPAddedEvent) Data() interface{} {
+func (e *GitHubIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitHubIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitHubIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitHubIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitHubIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event")
 	}
@@ -121,20 +118,20 @@ func ChangeGitHubScopes(scopes []string) func(*GitHubIDPChangedEvent) {
 	}
 }
 
-func (e *GitHubIDPChangedEvent) Data() interface{} {
+func (e *GitHubIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitHubIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitHubIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitHubIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitHubIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Sfrth", "unable to unmarshal event")
 	}
@@ -182,20 +179,20 @@ func NewGitHubEnterpriseIDPAddedEvent(
 	}
 }
 
-func (e *GitHubEnterpriseIDPAddedEvent) Data() interface{} {
+func (e *GitHubEnterpriseIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitHubEnterpriseIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitHubEnterpriseIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitHubEnterpriseIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitHubEnterpriseIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event")
 	}
@@ -284,20 +281,20 @@ func ChangeGitHubEnterpriseScopes(scopes []string) func(*GitHubEnterpriseIDPChan
 	}
 }
 
-func (e *GitHubEnterpriseIDPChangedEvent) Data() interface{} {
+func (e *GitHubEnterpriseIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitHubEnterpriseIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitHubEnterpriseIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitHubEnterpriseIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitHubEnterpriseIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-ASf3r", "unable to unmarshal event")
 	}

internal/repository/idp/gitlab.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type GitLabIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGitLabIDPAddedEvent(
 	}
 }
 
-func (e *GitLabIDPAddedEvent) Data() interface{} {
+func (e *GitLabIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitLabIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitLabIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitLabIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitLabIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-KLewio", "unable to unmarshal event")
 	}
@@ -122,20 +119,20 @@ func ChangeGitLabOptions(options OptionChanges) func(*GitLabIDPChangedEvent) {
 	}
 }
 
-func (e *GitLabIDPChangedEvent) Data() interface{} {
+func (e *GitLabIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitLabIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitLabIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitLabIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitLabIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Sfhjk", "unable to unmarshal event")
 	}
@@ -177,20 +174,20 @@ func NewGitLabSelfHostedIDPAddedEvent(
 	}
 }
 
-func (e *GitLabSelfHostedIDPAddedEvent) Data() interface{} {
+func (e *GitLabSelfHostedIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitLabSelfHostedIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitLabSelfHostedIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitLabSelfHostedIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitLabSelfHostedIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-S1efv", "unable to unmarshal event")
 	}
@@ -266,20 +263,20 @@ func ChangeGitLabSelfHostedOptions(options OptionChanges) func(*GitLabSelfHosted
 	}
 }
 
-func (e *GitLabSelfHostedIDPChangedEvent) Data() interface{} {
+func (e *GitLabSelfHostedIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GitLabSelfHostedIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GitLabSelfHostedIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GitLabSelfHostedIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GitLabSelfHostedIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-SFrhj", "unable to unmarshal event")
 	}

internal/repository/idp/google.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type GoogleIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGoogleIDPAddedEvent(
 	}
 }
 
-func (e *GoogleIDPAddedEvent) Data() interface{} {
+func (e *GoogleIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GoogleIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GoogleIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GoogleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GoogleIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-SAff1", "unable to unmarshal event")
 	}
@@ -121,20 +118,20 @@ func ChangeGoogleOptions(options OptionChanges) func(*GoogleIDPChangedEvent) {
 	}
 }
 
-func (e *GoogleIDPChangedEvent) Data() interface{} {
+func (e *GoogleIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GoogleIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GoogleIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func GoogleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GoogleIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-SF3t2", "unable to unmarshal event")
 	}

internal/repository/idp/idp.go

@@ -1,11 +1,8 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type Options struct {
@@ -74,20 +71,20 @@ func NewRemovedEvent(
 	}
 }
 
-func (e *RemovedEvent) Data() interface{} {
+func (e *RemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &RemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-plSD2", "unable to unmarshal event")
 	}

internal/repository/idp/jwt.go

@@ -1,11 +1,8 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type JWTIDPAddedEvent struct {
@@ -42,20 +39,20 @@ func NewJWTIDPAddedEvent(
 	}
 }
 
-func (e *JWTIDPAddedEvent) Data() interface{} {
+func (e *JWTIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *JWTIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *JWTIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func JWTIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &JWTIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
 	}
@@ -131,20 +128,20 @@ func ChangeJWTOptions(options OptionChanges) func(*JWTIDPChangedEvent) {
 	}
 }
 
-func (e *JWTIDPChangedEvent) Data() interface{} {
+func (e *JWTIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *JWTIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *JWTIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func JWTIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &JWTIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
 	}

internal/repository/idp/ldap.go

@@ -1,13 +1,11 @@
 package idp
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type LDAPIDPAddedEvent struct {
@@ -165,20 +163,20 @@ func NewLDAPIDPAddedEvent(
 	}
 }
 
-func (e *LDAPIDPAddedEvent) Data() interface{} {
+func (e *LDAPIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LDAPIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LDAPIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func LDAPIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LDAPIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Dgh42", "unable to unmarshal event")
 	}
@@ -329,20 +327,20 @@ func ChangeLDAPOptions(options OptionChanges) func(*LDAPIDPChangedEvent) {
 	}
 }
 
-func (e *LDAPIDPChangedEvent) Data() interface{} {
+func (e *LDAPIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LDAPIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LDAPIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func LDAPIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LDAPIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Sfth3", "unable to unmarshal event")
 	}

internal/repository/idp/oauth.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type OAuthIDPAddedEvent struct {
@@ -52,20 +49,20 @@ func NewOAuthIDPAddedEvent(
 	}
 }
 
-func (e *OAuthIDPAddedEvent) Data() interface{} {
+func (e *OAuthIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OAuthIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OAuthIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OAuthIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OAuthIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
 	}
@@ -161,20 +158,20 @@ func ChangeOAuthIDAttribute(idAttribute string) func(*OAuthIDPChangedEvent) {
 	}
 }
 
-func (e *OAuthIDPChangedEvent) Data() interface{} {
+func (e *OAuthIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OAuthIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OAuthIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OAuthIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OAuthIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-SAf3gw", "unable to unmarshal event")
 	}

internal/repository/idp/oidc.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type OIDCIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewOIDCIDPAddedEvent(
 	}
 }
 
-func (e *OIDCIDPAddedEvent) Data() interface{} {
+func (e *OIDCIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OIDCIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
 	}
@@ -142,20 +139,20 @@ func ChangeOIDCIsIDTokenMapping(idTokenMapping bool) func(*OIDCIDPChangedEvent)
 	}
 }
 
-func (e *OIDCIDPChangedEvent) Data() interface{} {
+func (e *OIDCIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OIDCIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
 	}
@@ -197,11 +194,11 @@ func (e *OIDCIDPMigratedAzureADEvent) Data() interface{} {
 	return e
 }
 
-func (e *OIDCIDPMigratedAzureADEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCIDPMigratedAzureADEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OIDCIDPMigratedAzureADEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedAzureADEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := AzureADIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -240,11 +237,11 @@ func (e *OIDCIDPMigratedGoogleEvent) Data() interface{} {
 	return e
 }
 
-func (e *OIDCIDPMigratedGoogleEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCIDPMigratedGoogleEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OIDCIDPMigratedGoogleEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedGoogleEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := GoogleIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/idp/saml.go

@@ -1,12 +1,9 @@
 package idp
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 type SAMLIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewSAMLIDPAddedEvent(
 	}
 }
 
-func (e *SAMLIDPAddedEvent) Data() interface{} {
+func (e *SAMLIDPAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SAMLIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SAMLIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SAMLIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SAMLIDPAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-v9uajo3k71", "unable to unmarshal event")
 	}
@@ -142,20 +139,20 @@ func ChangeSAMLOptions(options OptionChanges) func(*SAMLIDPChangedEvent) {
 	}
 }
 
-func (e *SAMLIDPChangedEvent) Data() interface{} {
+func (e *SAMLIDPChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SAMLIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SAMLIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SAMLIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SAMLIDPChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-w1t1824tw5", "unable to unmarshal event")
 	}

internal/repository/idpconfig/idp_config.go

@@ -1,27 +1,24 @@
 package idpconfig
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
 	UniqueIDPConfigNameType = "idp_config_names"
 )
 
-func NewAddIDPConfigNameUniqueConstraint(idpConfigName, resourceOwner string) *eventstore.EventUniqueConstraint {
+func NewAddIDPConfigNameUniqueConstraint(idpConfigName, resourceOwner string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueIDPConfigNameType,
 		idpConfigName+resourceOwner,
 		"Errors.IDPConfig.AlreadyExists")
 }
 
-func NewRemoveIDPConfigNameUniqueConstraint(idpConfigName, resourceOwner string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveIDPConfigNameUniqueConstraint(idpConfigName, resourceOwner string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueIDPConfigNameType,
 		idpConfigName+resourceOwner)
 }
@@ -54,20 +51,20 @@ func NewIDPConfigAddedEvent(
 	}
 }
 
-func (e *IDPConfigAddedEvent) Data() interface{} {
+func (e *IDPConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IDPConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddIDPConfigNameUniqueConstraint(e.Name, e.Aggregate().ResourceOwner)}
+func (e *IDPConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddIDPConfigNameUniqueConstraint(e.Name, e.Aggregate().ResourceOwner)}
 }
 
-func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IDPConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}
@@ -85,15 +82,15 @@ type IDPConfigChangedEvent struct {
 	oldName      string                       `json:"-"`
 }
 
-func (e *IDPConfigChangedEvent) Data() interface{} {
+func (e *IDPConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IDPConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IDPConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	if e.oldName == "" {
 		return nil
 	}
-	return []*eventstore.EventUniqueConstraint{
+	return []*eventstore.UniqueConstraint{
 		NewRemoveIDPConfigNameUniqueConstraint(e.oldName, e.Aggregate().ResourceOwner),
 		NewAddIDPConfigNameUniqueConstraint(*e.Name, e.Aggregate().ResourceOwner),
 	}
@@ -139,12 +136,12 @@ func ChangeAutoRegister(autoRegister bool) func(*IDPConfigChangedEvent) {
 	}
 }
 
-func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IDPConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}
@@ -169,20 +166,20 @@ func NewIDPConfigDeactivatedEvent(
 	}
 }
 
-func (e *IDPConfigDeactivatedEvent) Data() interface{} {
+func (e *IDPConfigDeactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IDPConfigDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IDPConfigDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IDPConfigDeactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}
@@ -207,20 +204,20 @@ func NewIDPConfigReactivatedEvent(
 	}
 }
 
-func (e *IDPConfigReactivatedEvent) Data() interface{} {
+func (e *IDPConfigReactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IDPConfigReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IDPConfigReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IDPConfigReactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}
@@ -248,20 +245,20 @@ func NewIDPConfigRemovedEvent(
 	}
 }
 
-func (e *IDPConfigRemovedEvent) Data() interface{} {
+func (e *IDPConfigRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IDPConfigRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveIDPConfigNameUniqueConstraint(e.name, e.Aggregate().ResourceOwner)}
+func (e *IDPConfigRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveIDPConfigNameUniqueConstraint(e.name, e.Aggregate().ResourceOwner)}
 }
 
-func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IDPConfigRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}

internal/repository/idpconfig/jwt_config.go

@@ -1,12 +1,9 @@
 package idpconfig
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -24,11 +21,11 @@ type JWTConfigAddedEvent struct {
 	HeaderName   string `json:"headerName,omitempty"`
 }
 
-func (e *JWTConfigAddedEvent) Data() interface{} {
+func (e *JWTConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *JWTConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *JWTConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -50,12 +47,12 @@ func NewJWTConfigAddedEvent(
 	}
 }
 
-func JWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &JWTConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "JWT-m0fwf", "unable to unmarshal event")
 	}
@@ -74,11 +71,11 @@ type JWTConfigChangedEvent struct {
 	HeaderName   *string `json:"headerName,omitempty"`
 }
 
-func (e *JWTConfigChangedEvent) Data() interface{} {
+func (e *JWTConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *JWTConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *JWTConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -126,12 +123,12 @@ func ChangeHeaderName(headerName string) func(*JWTConfigChangedEvent) {
 	}
 }
 
-func JWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &JWTConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "JWT-fk3fs", "unable to unmarshal event")
 	}

internal/repository/idpconfig/oidc_config.go

@@ -1,14 +1,10 @@
 package idpconfig
 
 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -31,11 +27,11 @@ type OIDCConfigAddedEvent struct {
 	UserNameMapping       domain.OIDCMappingField `json:"usernameMapping,omitempty"`
 }
 
-func (e *OIDCConfigAddedEvent) Data() interface{} {
+func (e *OIDCConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -66,12 +62,12 @@ func NewOIDCConfigAddedEvent(
 	}
 }
 
-func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}
@@ -95,11 +91,11 @@ type OIDCConfigChangedEvent struct {
 	UserNameMapping       *domain.OIDCMappingField `json:"usernameMapping,omitempty"`
 }
 
-func (e *OIDCConfigChangedEvent) Data() interface{} {
+func (e *OIDCConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -171,12 +167,12 @@ func ChangeScopes(scopes []string) func(*OIDCConfigChangedEvent) {
 	}
 }
 
-func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event")
 	}

internal/repository/idpintent/intent.go

@@ -2,13 +2,11 @@ package idpintent
 
 import (
 	"context"
-	"encoding/json"
 	"net/url"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -47,20 +45,20 @@ func NewStartedEvent(
 	}
 }
 
-func (e *StartedEvent) Data() interface{} {
+func (e *StartedEvent) Payload() any {
 	return e
 }
 
-func (e *StartedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *StartedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func StartedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func StartedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &StartedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Sf3f1", "unable to unmarshal event")
 	}
@@ -105,20 +103,20 @@ func NewSucceededEvent(
 	}
 }
 
-func (e *SucceededEvent) Data() interface{} {
+func (e *SucceededEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event")
 	}
@@ -160,20 +158,20 @@ func NewSAMLSucceededEvent(
 	}
 }
 
-func (e *SAMLSucceededEvent) Data() interface{} {
+func (e *SAMLSucceededEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SAMLSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SAMLSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SAMLSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SAMLSucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-l4tw23y6lq", "unable to unmarshal event")
 	}
@@ -202,20 +200,20 @@ func NewSAMLRequestEvent(
 	}
 }
 
-func (e *SAMLRequestEvent) Data() interface{} {
+func (e *SAMLRequestEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SAMLRequestEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SAMLRequestEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SAMLRequestEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLRequestEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SAMLRequestEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-l85678vwlf", "unable to unmarshal event")
 	}
@@ -257,20 +255,20 @@ func NewLDAPSucceededEvent(
 	}
 }
 
-func (e *LDAPSucceededEvent) Data() interface{} {
+func (e *LDAPSucceededEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LDAPSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LDAPSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func LDAPSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LDAPSucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event")
 	}
@@ -299,20 +297,20 @@ func NewFailedEvent(
 	}
 }
 
-func (e *FailedEvent) Data() interface{} {
+func (e *FailedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *FailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *FailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func FailedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func FailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &FailedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IDP-Sfer3", "unable to unmarshal event")
 	}

internal/repository/instance/custom_text.go

@@ -6,7 +6,6 @@ import (
 	"golang.org/x/text/language"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -38,7 +37,7 @@ func NewCustomTextSetEvent(
 	}
 }
 
-func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextSetEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -67,7 +66,7 @@ func NewCustomTextRemovedEvent(
 	}
 }
 
-func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -95,7 +94,7 @@ func NewCustomTextTemplateRemovedEvent(
 	}
 }
 
-func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextTemplateRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/debug_notification_file.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/settings"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -38,7 +36,7 @@ func NewDebugNotificationProviderFileAddedEvent(
 	}
 }
 
-func DebugNotificationProviderFileAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderFileAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -69,7 +67,7 @@ func NewDebugNotificationProviderFileChangedEvent(
 	return &DebugNotificationProviderFileChangedEvent{DebugNotificationProviderChangedEvent: *changedEvent}, nil
 }
 
-func DebugNotificationProviderFileChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderFileChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -96,7 +94,7 @@ func NewDebugNotificationProviderFileRemovedEvent(
 	}
 }
 
-func DebugNotificationProviderFileRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderFileRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/debug_notification_log.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/settings"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -40,7 +38,7 @@ func NewDebugNotificationProviderLogAddedEvent(
 	}
 }
 
-func DebugNotificationProviderLogAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderLogAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -71,7 +69,7 @@ func NewDebugNotificationProviderLogChangedEvent(
 	return &DebugNotificationProviderLogChangedEvent{DebugNotificationProviderChangedEvent: *changedEvent}, nil
 }
 
-func DebugNotificationProviderLogChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderLogChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -98,7 +96,7 @@ func NewDebugNotificationProviderLogRemovedEvent(
 	}
 }
 
-func DebugNotificationProviderLogRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DebugNotificationProviderLogRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := settings.DebugNotificationProviderRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/domain.go

@@ -2,12 +2,9 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -18,15 +15,15 @@ const (
 	InstanceDomainRemovedEventType    = domainEventPrefix + "removed"
 )
 
-func NewAddInstanceDomainUniqueConstraint(domain string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewAddGlobalEventUniqueConstraint(
+func NewAddInstanceDomainUniqueConstraint(domain string) *eventstore.UniqueConstraint {
+	return eventstore.NewAddGlobalUniqueConstraint(
 		UniqueInstanceDomain,
 		domain,
 		"Errors.Instance.Domain.AlreadyExists")
 }
 
-func NewRemoveInstanceDomainUniqueConstraint(domain string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveGlobalEventUniqueConstraint(
+func NewRemoveInstanceDomainUniqueConstraint(domain string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveGlobalUniqueConstraint(
 		UniqueInstanceDomain,
 		domain)
 }
@@ -38,12 +35,12 @@ type DomainAddedEvent struct {
 	Generated bool   `json:"generated,omitempty"`
 }
 
-func (e *DomainAddedEvent) Data() interface{} {
+func (e *DomainAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddInstanceDomainUniqueConstraint(e.Domain)}
+func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddInstanceDomainUniqueConstraint(e.Domain)}
 }
 
 func NewDomainAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string, generated bool) *DomainAddedEvent {
@@ -58,11 +55,11 @@ func NewDomainAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, d
 	}
 }
 
-func DomainAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	domainAdded := &DomainAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, domainAdded)
+	err := event.Unmarshal(domainAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "INSTANCE-3noij", "unable to unmarshal instance domain added")
 	}
@@ -76,11 +73,11 @@ type DomainPrimarySetEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainPrimarySetEvent) Data() interface{} {
+func (e *DomainPrimarySetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -95,11 +92,11 @@ func NewDomainPrimarySetEvent(ctx context.Context, aggregate *eventstore.Aggrega
 	}
 }
 
-func DomainPrimarySetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPrimarySetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	domainAdded := &DomainPrimarySetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, domainAdded)
+	err := event.Unmarshal(domainAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "INSTANCE-29jöF", "unable to unmarshal instance domain added")
 	}
@@ -113,12 +110,12 @@ type DomainRemovedEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainRemovedEvent) Data() interface{} {
+func (e *DomainRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveInstanceDomainUniqueConstraint(e.Domain)}
+func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveInstanceDomainUniqueConstraint(e.Domain)}
 }
 
 func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string) *DomainRemovedEvent {
@@ -132,11 +129,11 @@ func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate,
 	}
 }
 
-func DomainRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	domainRemoved := &DomainRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, domainRemoved)
+	err := event.Unmarshal(domainRemoved)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "INSTANCE-BngB2", "unable to unmarshal instance domain removed")
 	}

internal/repository/instance/event_default_language.go

@@ -2,13 +2,11 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 
 	"golang.org/x/text/language"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -21,11 +19,11 @@ type DefaultLanguageSetEvent struct {
 	Language language.Tag `json:"language"`
 }
 
-func (e *DefaultLanguageSetEvent) Data() interface{} {
+func (e *DefaultLanguageSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DefaultLanguageSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DefaultLanguageSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -44,11 +42,11 @@ func NewDefaultLanguageSetEvent(
 	}
 }
 
-func DefaultLanguageSetMapper(event *repository.Event) (eventstore.Event, error) {
+func DefaultLanguageSetMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DefaultLanguageSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-3j9fs", "unable to unmarshal default language set")
 	}

internal/repository/instance/event_iam_project_set.go

@@ -2,12 +2,9 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -21,11 +18,11 @@ type ProjectSetEvent struct {
 	ProjectID string `json:"iamProjectId"`
 }
 
-func (e *ProjectSetEvent) Data() interface{} {
+func (e *ProjectSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ProjectSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ProjectSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -44,11 +41,11 @@ func NewIAMProjectSetEvent(
 	}
 }
 
-func ProjectSetMapper(event *repository.Event) (eventstore.Event, error) {
+func ProjectSetMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ProjectSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal global org set")
 	}
@@ -63,11 +60,11 @@ type ConsoleSetEvent struct {
 	AppID    string `json:"appId"`
 }
 
-func (e *ConsoleSetEvent) Data() interface{} {
+func (e *ConsoleSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ConsoleSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ConsoleSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -88,11 +85,11 @@ func NewIAMConsoleSetEvent(
 	}
 }
 
-func ConsoleSetMapper(event *repository.Event) (eventstore.Event, error) {
+func ConsoleSetMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ConsoleSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal console set")
 	}

internal/repository/instance/event_org_set.go

@@ -2,12 +2,9 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -20,11 +17,11 @@ type DefaultOrgSetEvent struct {
 	OrgID string `json:"orgId"`
 }
 
-func (e *DefaultOrgSetEvent) Data() interface{} {
+func (e *DefaultOrgSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DefaultOrgSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DefaultOrgSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -43,11 +40,11 @@ func NewDefaultOrgSetEventEvent(
 	}
 }
 
-func DefaultOrgSetMapper(event *repository.Event) (eventstore.Event, error) {
+func DefaultOrgSetMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DefaultOrgSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal default org set")
 	}

internal/repository/instance/idp.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/idp"
 )
 
@@ -80,7 +79,7 @@ func NewOAuthIDPAddedEvent(
 	}
 }
 
-func OAuthIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OAuthIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -115,7 +114,7 @@ func NewOAuthIDPChangedEvent(
 	return &OAuthIDPChangedEvent{OAuthIDPChangedEvent: *changedEvent}, nil
 }
 
-func OAuthIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OAuthIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -160,7 +159,7 @@ func NewOIDCIDPAddedEvent(
 	}
 }
 
-func OIDCIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -195,7 +194,7 @@ func NewOIDCIDPChangedEvent(
 	return &OIDCIDPChangedEvent{OIDCIDPChangedEvent: *changedEvent}, nil
 }
 
-func OIDCIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -239,7 +238,7 @@ func NewOIDCIDPMigratedAzureADEvent(
 	}
 }
 
-func OIDCIDPMigratedAzureADEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedAzureADEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPMigratedAzureADEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -279,7 +278,7 @@ func NewOIDCIDPMigratedGoogleEvent(
 	}
 }
 
-func OIDCIDPMigratedGoogleEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedGoogleEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPMigratedGoogleEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -322,7 +321,7 @@ func NewJWTIDPAddedEvent(
 	}
 }
 
-func JWTIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.JWTIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -357,7 +356,7 @@ func NewJWTIDPChangedEvent(
 	return &JWTIDPChangedEvent{JWTIDPChangedEvent: *changedEvent}, nil
 }
 
-func JWTIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.JWTIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -402,7 +401,7 @@ func NewAzureADIDPAddedEvent(
 	}
 }
 
-func AzureADIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AzureADIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -437,7 +436,7 @@ func NewAzureADIDPChangedEvent(
 	return &AzureADIDPChangedEvent{AzureADIDPChangedEvent: *changedEvent}, nil
 }
 
-func AzureADIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AzureADIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -478,7 +477,7 @@ func NewGitHubIDPAddedEvent(
 	}
 }
 
-func GitHubIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -513,7 +512,7 @@ func NewGitHubIDPChangedEvent(
 	return &GitHubIDPChangedEvent{GitHubIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitHubIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -560,7 +559,7 @@ func NewGitHubEnterpriseIDPAddedEvent(
 	}
 }
 
-func GitHubEnterpriseIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubEnterpriseIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -595,7 +594,7 @@ func NewGitHubEnterpriseIDPChangedEvent(
 	return &GitHubEnterpriseIDPChangedEvent{GitHubEnterpriseIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitHubEnterpriseIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubEnterpriseIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -636,7 +635,7 @@ func NewGitLabIDPAddedEvent(
 	}
 }
 
-func GitLabIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -671,7 +670,7 @@ func NewGitLabIDPChangedEvent(
 	return &GitLabIDPChangedEvent{GitLabIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitLabIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -714,7 +713,7 @@ func NewGitLabSelfHostedIDPAddedEvent(
 	}
 }
 
-func GitLabSelfHostedIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabSelfHostedIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -749,7 +748,7 @@ func NewGitLabSelfHostedIDPChangedEvent(
 	return &GitLabSelfHostedIDPChangedEvent{GitLabSelfHostedIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitLabSelfHostedIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabSelfHostedIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -790,7 +789,7 @@ func NewGoogleIDPAddedEvent(
 	}
 }
 
-func GoogleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GoogleIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -825,7 +824,7 @@ func NewGoogleIDPChangedEvent(
 	return &GoogleIDPChangedEvent{GoogleIDPChangedEvent: *changedEvent}, nil
 }
 
-func GoogleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GoogleIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -880,7 +879,7 @@ func NewLDAPIDPAddedEvent(
 	}
 }
 
-func LDAPIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.LDAPIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -914,7 +913,7 @@ func NewLDAPIDPChangedEvent(
 	return &LDAPIDPChangedEvent{LDAPIDPChangedEvent: *changedEvent}, nil
 }
 
-func LDAPIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.LDAPIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -959,7 +958,7 @@ func NewAppleIDPAddedEvent(
 	}
 }
 
-func AppleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AppleIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -994,7 +993,7 @@ func NewAppleIDPChangedEvent(
 	return &AppleIDPChangedEvent{AppleIDPChangedEvent: *changedEvent}, nil
 }
 
-func AppleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AppleIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1038,7 +1037,7 @@ func NewSAMLIDPAddedEvent(
 	}
 }
 
-func SAMLIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.SAMLIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1073,7 +1072,7 @@ func NewSAMLIDPChangedEvent(
 	return &SAMLIDPChangedEvent{SAMLIDPChangedEvent: *changedEvent}, nil
 }
 
-func SAMLIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.SAMLIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1103,11 +1102,11 @@ func NewIDPRemovedEvent(
 	}
 }
 
-func (e *IDPRemovedEvent) Data() interface{} {
+func (e *IDPRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func IDPRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/idp_config.go

@@ -3,10 +3,8 @@ package instance
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -48,7 +46,7 @@ func NewIDPConfigAddedEvent(
 	}
 }
 
-func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -83,7 +81,7 @@ func NewIDPConfigChangedEvent(
 	return &IDPConfigChangedEvent{IDPConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -115,7 +113,7 @@ func NewIDPConfigRemovedEvent(
 	}
 }
 
-func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -146,7 +144,7 @@ func NewIDPConfigDeactivatedEvent(
 	}
 }
 
-func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigDeactivatedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -177,7 +175,7 @@ func NewIDPConfigReactivatedEvent(
 	}
 }
 
-func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigReactivatedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/idp_jwt_config.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -43,7 +41,7 @@ func NewIDPJWTConfigAddedEvent(
 	}
 }
 
-func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPJWTConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.JWTConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -76,7 +74,7 @@ func NewIDPJWTConfigChangedEvent(
 	return &IDPJWTConfigChangedEvent{JWTConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPJWTConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.JWTConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/idp_oidc_config.go

@@ -3,11 +3,9 @@ package instance
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -54,7 +52,7 @@ func NewIDPOIDCConfigAddedEvent(
 	}
 }
 
-func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPOIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.OIDCConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -87,7 +85,7 @@ func NewIDPOIDCConfigChangedEvent(
 	return &IDPOIDCConfigChangedEvent{OIDCConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPOIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.OIDCConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/instance.go

@@ -2,11 +2,9 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -21,11 +19,11 @@ type InstanceAddedEvent struct {
 	Name string `json:"name,omitempty"`
 }
 
-func (e *InstanceAddedEvent) Data() interface{} {
+func (e *InstanceAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *InstanceAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *InstanceAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -40,11 +38,11 @@ func NewInstanceAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate,
 	}
 }
 
-func InstanceAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func InstanceAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	instanceAdded := &InstanceAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, instanceAdded)
+	err := event.Unmarshal(instanceAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "INSTANCE-s9l3F", "unable to unmarshal instance added")
 	}
@@ -58,11 +56,11 @@ type InstanceChangedEvent struct {
 	Name string `json:"name,omitempty"`
 }
 
-func (e *InstanceChangedEvent) Data() interface{} {
+func (e *InstanceChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *InstanceChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *InstanceChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -77,11 +75,11 @@ func NewInstanceChangedEvent(ctx context.Context, aggregate *eventstore.Aggregat
 	}
 }
 
-func InstanceChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func InstanceChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	instanceChanged := &InstanceChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, instanceChanged)
+	err := event.Unmarshal(instanceChanged)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "INSTANCE-3hfo8", "unable to unmarshal instance changed")
 	}
@@ -95,12 +93,12 @@ type InstanceRemovedEvent struct {
 	domains              []string
 }
 
-func (e *InstanceRemovedEvent) Data() interface{} {
+func (e *InstanceRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *InstanceRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	constraints := make([]*eventstore.EventUniqueConstraint, len(e.domains)+1)
+func (e *InstanceRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	constraints := make([]*eventstore.UniqueConstraint, len(e.domains)+1)
 	for i, domain := range e.domains {
 		constraints[i] = NewRemoveInstanceDomainUniqueConstraint(domain)
 	}
@@ -120,7 +118,7 @@ func NewInstanceRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregat
 	}
 }
 
-func InstanceRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func InstanceRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &InstanceRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/instance/member.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/member"
 )
 
@@ -40,7 +38,7 @@ func NewMemberAddedEvent(
 	}
 }
 
-func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.MemberAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -72,7 +70,7 @@ func NewMemberChangedEvent(
 	}
 }
 
-func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.ChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -102,7 +100,7 @@ func NewMemberRemovedEvent(
 	}
 }
 
-func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -132,7 +130,7 @@ func NewMemberCascadeRemovedEvent(
 	}
 }
 
-func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.CascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/oidc_settings.go

@@ -2,12 +2,10 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -46,19 +44,19 @@ func NewOIDCSettingsAddedEvent(
 	}
 }
 
-func (e *OIDCSettingsAddedEvent) Data() interface{} {
+func (e *OIDCSettingsAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCSettingsAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCSettingsAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func OIDCSettingsAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCSettingsAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	oidcSettingsAdded := &OIDCSettingsAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, oidcSettingsAdded)
+	err := event.Unmarshal(oidcSettingsAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added")
 	}
@@ -75,11 +73,11 @@ type OIDCSettingsChangedEvent struct {
 	RefreshTokenExpiration     *time.Duration `json:"refreshTokenExpiration,omitempty"`
 }
 
-func (e *OIDCSettingsChangedEvent) Data() interface{} {
+func (e *OIDCSettingsChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCSettingsChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCSettingsChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -130,12 +128,12 @@ func ChangeOIDCSettingsRefreshTokenExpiration(refreshTokenExpiration time.Durati
 	}
 }
 
-func OIDCSettingsChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCSettingsChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCSettingsChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-f98uf", "unable to unmarshal oidc settings changed")
 	}

internal/repository/instance/policy_domain.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -38,7 +36,7 @@ func NewDomainPolicyAddedEvent(
 	}
 }
 
-func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -69,7 +67,7 @@ func NewDomainPolicyChangedEvent(
 	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
 }
 
-func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_label.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -68,7 +66,7 @@ func NewLabelPolicyAddedEvent(
 	}
 }
 
-func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -99,7 +97,7 @@ func NewLabelPolicyChangedEvent(
 	return &LabelPolicyChangedEvent{LabelPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -126,7 +124,7 @@ func NewLabelPolicyActivatedEvent(
 	}
 }
 
-func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyActivatedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -155,7 +153,7 @@ func NewLabelPolicyLogoAddedEvent(
 	}
 }
 
-func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -184,7 +182,7 @@ func NewLabelPolicyLogoRemovedEvent(
 	}
 }
 
-func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -213,7 +211,7 @@ func NewLabelPolicyIconAddedEvent(
 	}
 }
 
-func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -242,7 +240,7 @@ func NewLabelPolicyIconRemovedEvent(
 	}
 }
 
-func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -271,7 +269,7 @@ func NewLabelPolicyLogoDarkAddedEvent(
 	}
 }
 
-func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoDarkAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -300,7 +298,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(
 	}
 }
 
-func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoDarkRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -329,7 +327,7 @@ func NewLabelPolicyIconDarkAddedEvent(
 	}
 }
 
-func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconDarkAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -358,7 +356,7 @@ func NewLabelPolicyIconDarkRemovedEvent(
 	}
 }
 
-func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconDarkRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -387,7 +385,7 @@ func NewLabelPolicyFontAddedEvent(
 	}
 }
 
-func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyFontAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -416,7 +414,7 @@ func NewLabelPolicyFontRemovedEvent(
 	}
 }
 
-func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyFontRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -429,11 +427,11 @@ type LabelPolicyAssetsRemovedEvent struct {
 	policy.LabelPolicyAssetsRemovedEvent
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) Data() interface{} {
+func (e *LabelPolicyAssetsRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -451,7 +449,7 @@ func NewLabelPolicyAssetsRemovedEvent(
 	}
 }
 
-func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyAssetsRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_login.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -67,7 +65,7 @@ func NewLoginPolicyAddedEvent(
 	}
 }
 
-func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LoginPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -98,7 +96,7 @@ func NewLoginPolicyChangedEvent(
 	return &LoginPolicyChangedEvent{LoginPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LoginPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_login_factors.go

@@ -3,10 +3,8 @@ package instance
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -37,7 +35,7 @@ func NewLoginPolicySecondFactorAddedEvent(
 	}
 }
 
-func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.SecondFactorAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -68,7 +66,7 @@ func NewLoginPolicySecondFactorRemovedEvent(
 	}
 }
 
-func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.SecondFactorRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -98,7 +96,7 @@ func NewLoginPolicyMultiFactorAddedEvent(
 	}
 }
 
-func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MultiFactorAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -129,7 +127,7 @@ func NewLoginPolicyMultiFactorRemovedEvent(
 	}
 }
 
-func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MultiFactorRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_login_identity_provider.go

@@ -3,10 +3,8 @@ package instance
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -37,7 +35,7 @@ func NewIdentityProviderAddedEvent(
 	}
 }
 
-func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -67,7 +65,7 @@ func NewIdentityProviderRemovedEvent(
 	}
 }
 
-func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -94,7 +92,7 @@ func NewIdentityProviderCascadeRemovedEvent(
 	}
 }
 
-func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderCascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_mail_template.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -29,7 +28,7 @@ func NewMailTemplateAddedEvent(
 	}
 }
 
-func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTemplateAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -57,7 +56,7 @@ func NewMailTemplateChangedEvent(
 	return &MailTemplateChangedEvent{MailTemplateChangedEvent: *changedEvent}, nil
 }
 
-func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTemplateChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_mail_text.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -43,7 +42,7 @@ func NewMailTextAddedEvent(
 	}
 }
 
-func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTextAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -75,7 +74,7 @@ func NewMailTextChangedEvent(
 	return &MailTextChangedEvent{MailTextChangedEvent: *changedEvent}, nil
 }
 
-func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTextChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_notification.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -32,7 +31,7 @@ func NewNotificationPolicyAddedEvent(
 	}
 }
 
-func NotificationPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.NotificationPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -63,7 +62,7 @@ func NewNotificationPolicyChangedEvent(
 	return &NotificationPolicyChangedEvent{NotificationPolicyChangedEvent: *changedEvent}, nil
 }
 
-func NotificationPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.NotificationPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_password_age.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -35,7 +33,7 @@ func NewPasswordAgePolicyAddedEvent(
 	}
 }
 
-func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordAgePolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -66,7 +64,7 @@ func NewPasswordAgePolicyChangedEvent(
 	return &PasswordAgePolicyChangedEvent{PasswordAgePolicyChangedEvent: *changedEvent}, nil
 }
 
-func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordAgePolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_password_complexity.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -41,7 +39,7 @@ func NewPasswordComplexityPolicyAddedEvent(
 	}
 }
 
-func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordComplexityPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -72,7 +70,7 @@ func NewPasswordComplexityPolicyChangedEvent(
 	return &PasswordComplexityPolicyChangedEvent{PasswordComplexityPolicyChangedEvent: *changedEvent}, nil
 }
 
-func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordComplexityPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_password_lockout.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -35,7 +33,7 @@ func NewLockoutPolicyAddedEvent(
 	}
 }
 
-func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LockoutPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -66,7 +64,7 @@ func NewLockoutPolicyChangedEvent(
 	return &LockoutPolicyChangedEvent{LockoutPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LockoutPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_privacy.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -39,7 +38,7 @@ func NewPrivacyPolicyAddedEvent(
 	}
 }
 
-func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PrivacyPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -70,7 +69,7 @@ func NewPrivacyPolicyChangedEvent(
 	return &PrivacyPolicyChangedEvent{PrivacyPolicyChangedEvent: *changedEvent}, nil
 }
 
-func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PrivacyPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/instance/policy_security.go

@@ -2,11 +2,9 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -59,19 +57,19 @@ func ChangeSecurityPolicyAllowedOrigins(allowedOrigins []string) func(event *Sec
 	}
 }
 
-func (e *SecurityPolicySetEvent) Data() interface{} {
+func (e *SecurityPolicySetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecurityPolicySetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecurityPolicySetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SecurityPolicySetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecurityPolicySetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	securityPolicyAdded := &SecurityPolicySetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, securityPolicyAdded)
+	err := event.Unmarshal(securityPolicyAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added")
 	}

internal/repository/instance/secret_generator.go

@@ -2,13 +2,11 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -19,15 +17,15 @@ const (
 	SecretGeneratorRemovedEventType = instanceEventTypePrefix + secretGeneratorPrefix + "removed"
 )
 
-func NewAddSecretGeneratorTypeUniqueConstraint(generatorType domain.SecretGeneratorType) *eventstore.EventUniqueConstraint {
+func NewAddSecretGeneratorTypeUniqueConstraint(generatorType domain.SecretGeneratorType) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueSecretGeneratorType,
 		string(generatorType),
 		"Errors.SecretGenerator.AlreadyExists")
 }
 
-func NewRemoveSecretGeneratorTypeUniqueConstraint(generatorType domain.SecretGeneratorType) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveSecretGeneratorTypeUniqueConstraint(generatorType domain.SecretGeneratorType) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueSecretGeneratorType,
 		string(generatorType))
 }
@@ -71,19 +69,19 @@ func NewSecretGeneratorAddedEvent(
 	}
 }
 
-func (e *SecretGeneratorAddedEvent) Data() interface{} {
+func (e *SecretGeneratorAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecretGeneratorAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddSecretGeneratorTypeUniqueConstraint(e.GeneratorType)}
+func (e *SecretGeneratorAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddSecretGeneratorTypeUniqueConstraint(e.GeneratorType)}
 }
 
-func SecretGeneratorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecretGeneratorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	secretGeneratorAdded := &SecretGeneratorAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, secretGeneratorAdded)
+	err := event.Unmarshal(secretGeneratorAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-en9f4", "unable to unmarshal secret generator added")
 	}
@@ -103,11 +101,11 @@ type SecretGeneratorChangedEvent struct {
 	IncludeSymbols      *bool                      `json:"includeSymbols,omitempty"`
 }
 
-func (e *SecretGeneratorChangedEvent) Data() interface{} {
+func (e *SecretGeneratorChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecretGeneratorChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecretGeneratorChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -172,12 +170,12 @@ func ChangeSecretGeneratorIncludeSymbols(includeSymbols bool) func(event *Secret
 	}
 }
 
-func SecretGeneratorChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecretGeneratorChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecretGeneratorChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-2m09e", "unable to unmarshal secret generator changed")
 	}
@@ -191,12 +189,12 @@ type SecretGeneratorRemovedEvent struct {
 	GeneratorType domain.SecretGeneratorType `json:"generatorType"`
 }
 
-func (e *SecretGeneratorRemovedEvent) Data() interface{} {
+func (e *SecretGeneratorRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecretGeneratorRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveSecretGeneratorTypeUniqueConstraint(e.GeneratorType)}
+func (e *SecretGeneratorRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveSecretGeneratorTypeUniqueConstraint(e.GeneratorType)}
 }
 
 func NewSecretGeneratorRemovedEvent(
@@ -214,12 +212,12 @@ func NewSecretGeneratorRemovedEvent(
 	}
 }
 
-func SecretGeneratorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecretGeneratorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecretGeneratorRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-m09ke", "unable to unmarshal secret generator removed")
 	}

internal/repository/instance/sms.go

@@ -2,12 +2,10 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -51,19 +49,19 @@ func NewSMSConfigTwilioAddedEvent(
 	}
 }
 
-func (e *SMSConfigTwilioAddedEvent) Data() interface{} {
+func (e *SMSConfigTwilioAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigTwilioAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigTwilioAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigTwilioAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigTwilioAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smsConfigAdded := &SMSConfigTwilioAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smsConfigAdded)
+	err := event.Unmarshal(smsConfigAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added")
 	}
@@ -116,19 +114,19 @@ func ChangeSMSConfigTwilioSenderNumber(senderNumber string) func(event *SMSConfi
 	}
 }
 
-func (e *SMSConfigTwilioChangedEvent) Data() interface{} {
+func (e *SMSConfigTwilioChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigTwilioChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigTwilioChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigTwilioChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigTwilioChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smsConfigChanged := &SMSConfigTwilioChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smsConfigChanged)
+	err := event.Unmarshal(smsConfigChanged)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added")
 	}
@@ -160,19 +158,19 @@ func NewSMSConfigTokenChangedEvent(
 	}
 }
 
-func (e *SMSConfigTwilioTokenChangedEvent) Data() interface{} {
+func (e *SMSConfigTwilioTokenChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigTwilioTokenChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigTwilioTokenChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigTwilioTokenChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigTwilioTokenChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smtpConfigTokenChagned := &SMSConfigTwilioTokenChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smtpConfigTokenChagned)
+	err := event.Unmarshal(smtpConfigTokenChagned)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-fi9Wf", "unable to unmarshal sms config token changed")
 	}
@@ -200,19 +198,19 @@ func NewSMSConfigTwilioActivatedEvent(
 	}
 }
 
-func (e *SMSConfigActivatedEvent) Data() interface{} {
+func (e *SMSConfigActivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigActivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigActivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smsConfigActivated := &SMSConfigActivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smsConfigActivated)
+	err := event.Unmarshal(smsConfigActivated)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio activated changed")
 	}
@@ -240,19 +238,19 @@ func NewSMSConfigDeactivatedEvent(
 	}
 }
 
-func (e *SMSConfigDeactivatedEvent) Data() interface{} {
+func (e *SMSConfigDeactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smsConfigDeactivated := &SMSConfigDeactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smsConfigDeactivated)
+	err := event.Unmarshal(smsConfigDeactivated)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio deactivated changed")
 	}
@@ -280,19 +278,19 @@ func NewSMSConfigRemovedEvent(
 	}
 }
 
-func (e *SMSConfigRemovedEvent) Data() interface{} {
+func (e *SMSConfigRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMSConfigRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMSConfigRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMSConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMSConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smsConfigRemoved := &SMSConfigRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smsConfigRemoved)
+	err := event.Unmarshal(smsConfigRemoved)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal sms config removed")
 	}

internal/repository/instance/smtp_config.go

@@ -2,12 +2,10 @@ package instance
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -57,19 +55,19 @@ func NewSMTPConfigAddedEvent(
 	}
 }
 
-func (e *SMTPConfigAddedEvent) Data() interface{} {
+func (e *SMTPConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMTPConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMTPConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMTPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMTPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smtpConfigAdded := &SMTPConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smtpConfigAdded)
+	err := event.Unmarshal(smtpConfigAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-39fks", "unable to unmarshal smtp config added")
 	}
@@ -88,11 +86,11 @@ type SMTPConfigChangedEvent struct {
 	User           *string `json:"user,omitempty"`
 }
 
-func (e *SMTPConfigChangedEvent) Data() interface{} {
+func (e *SMTPConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMTPConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMTPConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -155,12 +153,12 @@ func ChangeSMTPConfigSMTPUser(smtpUser string) func(event *SMTPConfigChangedEven
 	}
 }
 
-func SMTPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMTPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SMTPConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-m09oo", "unable to unmarshal smtp changed")
 	}
@@ -189,19 +187,19 @@ func NewSMTPConfigPasswordChangedEvent(
 	}
 }
 
-func (e *SMTPConfigPasswordChangedEvent) Data() interface{} {
+func (e *SMTPConfigPasswordChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMTPConfigPasswordChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMTPConfigPasswordChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMTPConfigPasswordChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMTPConfigPasswordChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smtpConfigPasswordChagned := &SMTPConfigPasswordChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smtpConfigPasswordChagned)
+	err := event.Unmarshal(smtpConfigPasswordChagned)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal smtp config password changed")
 	}
@@ -226,19 +224,19 @@ func NewSMTPConfigRemovedEvent(
 	}
 }
 
-func (e *SMTPConfigRemovedEvent) Data() interface{} {
+func (e *SMTPConfigRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SMTPConfigRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SMTPConfigRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
-func SMTPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SMTPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	smtpConfigRemoved := &SMTPConfigRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, smtpConfigRemoved)
+	err := event.Unmarshal(smtpConfigRemoved)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "IAM-DVw1s", "unable to unmarshal smtp config removed")
 	}

internal/repository/keypair/certificate.go

@@ -2,13 +2,11 @@ package keypair
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -21,11 +19,11 @@ type AddedCertificateEvent struct {
 	Certificate *Key `json:"certificate"`
 }
 
-func (e *AddedCertificateEvent) Data() interface{} {
+func (e *AddedCertificateEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedCertificateEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedCertificateEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -47,12 +45,12 @@ func NewAddedCertificateEvent(
 	}
 }
 
-func AddedCertificateEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AddedCertificateEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AddedCertificateEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "KEY-4n9vs", "unable to unmarshal certificate added")
 	}

internal/repository/keypair/key_pair.go

@@ -2,14 +2,12 @@ package keypair
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -31,11 +29,11 @@ type Key struct {
 	Expiry time.Time           `json:"expiry"`
 }
 
-func (e *AddedEvent) Data() interface{} {
+func (e *AddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -67,12 +65,12 @@ func NewAddedEvent(
 	}
 }
 
-func AddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &AddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "KEY-4n8vs", "unable to unmarshal key pair added")
 	}

internal/repository/member/events.go

@@ -1,12 +1,10 @@
 package member
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -17,15 +15,15 @@ const (
 	CascadeRemovedEventType = "member.cascade.removed"
 )
 
-func NewAddMemberUniqueConstraint(aggregateID, userID string) *eventstore.EventUniqueConstraint {
+func NewAddMemberUniqueConstraint(aggregateID, userID string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueMember,
 		fmt.Sprintf("%s:%s", aggregateID, userID),
 		"Errors.Member.AlreadyExists")
 }
 
-func NewRemoveMemberUniqueConstraint(aggregateID, userID string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveMemberUniqueConstraint(aggregateID, userID string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueMember,
 		fmt.Sprintf("%s:%s", aggregateID, userID),
 	)
@@ -38,12 +36,12 @@ type MemberAddedEvent struct {
 	UserID string   `json:"userId"`
 }
 
-func (e *MemberAddedEvent) Data() interface{} {
+func (e *MemberAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MemberAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
+func (e *MemberAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
 }
 
 func NewMemberAddedEvent(
@@ -59,12 +57,12 @@ func NewMemberAddedEvent(
 	}
 }
 
-func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MemberAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy")
 	}
@@ -79,11 +77,11 @@ type MemberChangedEvent struct {
 	UserID string   `json:"userId,omitempty"`
 }
 
-func (e *MemberChangedEvent) Data() interface{} {
+func (e *MemberChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MemberChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MemberChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -99,12 +97,12 @@ func NewMemberChangedEvent(
 	}
 }
 
-func ChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MemberChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy")
 	}
@@ -118,12 +116,12 @@ type MemberRemovedEvent struct {
 	UserID string `json:"userId"`
 }
 
-func (e *MemberRemovedEvent) Data() interface{} {
+func (e *MemberRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MemberRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
+func (e *MemberRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
 }
 
 func NewRemovedEvent(
@@ -137,12 +135,12 @@ func NewRemovedEvent(
 	}
 }
 
-func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MemberRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "MEMBER-Ep4ip", "unable to unmarshal label policy")
 	}
@@ -156,12 +154,12 @@ type MemberCascadeRemovedEvent struct {
 	UserID string `json:"userId"`
 }
 
-func (e *MemberCascadeRemovedEvent) Data() interface{} {
+func (e *MemberCascadeRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MemberCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
+func (e *MemberCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveMemberUniqueConstraint(e.Aggregate().ID, e.UserID)}
 }
 
 func NewCascadeRemovedEvent(
@@ -175,12 +173,12 @@ func NewCascadeRemovedEvent(
 	}
 }
 
-func CascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MemberCascadeRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "MEMBER-3j9sf", "unable to unmarshal label policy")
 	}

internal/repository/metadata/metadata.go

@@ -1,11 +1,8 @@
 package metadata
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -21,11 +18,11 @@ type SetEvent struct {
 	Value []byte `json:"value"`
 }
 
-func (e *SetEvent) Data() interface{} {
+func (e *SetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -41,12 +38,12 @@ func NewSetEvent(
 	}
 }
 
-func SetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "META-3n9fs", "unable to unmarshal metadata set")
 	}
@@ -60,11 +57,11 @@ type RemovedEvent struct {
 	Key string `json:"key"`
 }
 
-func (e *RemovedEvent) Data() interface{} {
+func (e *RemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -79,12 +76,12 @@ func NewRemovedEvent(
 	}
 }
 
-func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &RemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "META-2m99f", "unable to unmarshal metadata removed")
 	}
@@ -96,11 +93,11 @@ type RemovedAllEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *RemovedAllEvent) Data() interface{} {
+func (e *RemovedAllEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *RemovedAllEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RemovedAllEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -113,7 +110,7 @@ func NewRemovedAllEvent(
 	}
 }
 
-func RemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) {
+func RemovedAllEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &RemovedAllEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/milestone/events.go

@@ -11,6 +11,8 @@ const (
 	PushedEventType = eventTypePrefix + "pushed"
 )
 
+var _ eventstore.Command = (*PushedEvent)(nil)
+
 type PushedEvent struct {
 	*eventstore.BaseEvent `json:"-"`
 	MilestoneType         Type     `json:"type"`
@@ -19,11 +21,12 @@ type PushedEvent struct {
 	Endpoints             []string `json:"endpoints"`
 }
 
-func (p *PushedEvent) Data() interface{} {
+// Payload implements eventstore.Command.
+func (p *PushedEvent) Payload() any {
 	return p
 }
 
-func (p *PushedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (p *PushedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 

internal/repository/oidcsession/oidc_session.go

@@ -30,11 +30,11 @@ type AddedEvent struct {
 	AuthTime    time.Time                   `json:"authTime"`
 }
 
-func (e *AddedEvent) Data() interface{} {
+func (e *AddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -76,11 +76,11 @@ type AccessTokenAddedEvent struct {
 	Lifetime time.Duration `json:"lifetime"`
 }
 
-func (e *AccessTokenAddedEvent) Data() interface{} {
+func (e *AccessTokenAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AccessTokenAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AccessTokenAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -111,11 +111,11 @@ type AccessTokenRevokedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *AccessTokenRevokedEvent) Data() interface{} {
+func (e *AccessTokenRevokedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *AccessTokenRevokedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *AccessTokenRevokedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -144,11 +144,11 @@ type RefreshTokenAddedEvent struct {
 	IdleLifetime time.Duration `json:"idleLifetime"`
 }
 
-func (e *RefreshTokenAddedEvent) Data() interface{} {
+func (e *RefreshTokenAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RefreshTokenAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RefreshTokenAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -182,11 +182,11 @@ type RefreshTokenRenewedEvent struct {
 	IdleLifetime time.Duration `json:"idleLifetime"`
 }
 
-func (e *RefreshTokenRenewedEvent) Data() interface{} {
+func (e *RefreshTokenRenewedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RefreshTokenRenewedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RefreshTokenRenewedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -215,11 +215,11 @@ type RefreshTokenRevokedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *RefreshTokenRevokedEvent) Data() interface{} {
+func (e *RefreshTokenRevokedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *RefreshTokenRevokedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *RefreshTokenRevokedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 

internal/repository/org/custom_text.go

@@ -6,8 +6,6 @@ import (
 	"golang.org/x/text/language"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -39,7 +37,7 @@ func NewCustomTextSetEvent(
 	}
 }
 
-func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextSetEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -69,7 +67,7 @@ func NewCustomTextRemovedEvent(
 	}
 }
 
-func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -97,7 +95,7 @@ func NewCustomTextTemplateRemovedEvent(
 	}
 }
 
-func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.CustomTextTemplateRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/domain.go

@@ -2,14 +2,11 @@ package org
 
 import (
 	"context"
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -23,15 +20,15 @@ const (
 	OrgDomainRemovedEventType            = domainEventPrefix + "removed"
 )
 
-func NewAddOrgDomainUniqueConstraint(orgDomain string) *eventstore.EventUniqueConstraint {
+func NewAddOrgDomainUniqueConstraint(orgDomain string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueOrgDomain,
 		orgDomain,
 		"Errors.Org.Domain.AlreadyExists")
 }
 
-func NewRemoveOrgDomainUniqueConstraint(orgDomain string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveOrgDomainUniqueConstraint(orgDomain string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueOrgDomain,
 		orgDomain)
 }
@@ -42,11 +39,11 @@ type DomainAddedEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainAddedEvent) Data() interface{} {
+func (e *DomainAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -61,11 +58,11 @@ func NewDomainAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, d
 	}
 }
 
-func DomainAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainAdded := &DomainAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainAdded)
+	err := event.Unmarshal(orgDomainAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-GBr52", "unable to unmarshal org domain added")
 	}
@@ -81,11 +78,11 @@ type DomainVerificationAddedEvent struct {
 	ValidationCode *crypto.CryptoValue            `json:"validationCode,omitempty"`
 }
 
-func (e *DomainVerificationAddedEvent) Data() interface{} {
+func (e *DomainVerificationAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainVerificationAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainVerificationAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -107,11 +104,11 @@ func NewDomainVerificationAddedEvent(
 	}
 }
 
-func DomainVerificationAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainVerificationAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainVerificationAdded := &DomainVerificationAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainVerificationAdded)
+	err := event.Unmarshal(orgDomainVerificationAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-NRN32", "unable to unmarshal org domain verification added")
 	}
@@ -125,11 +122,11 @@ type DomainVerificationFailedEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainVerificationFailedEvent) Data() interface{} {
+func (e *DomainVerificationFailedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainVerificationFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainVerificationFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -144,11 +141,11 @@ func NewDomainVerificationFailedEvent(ctx context.Context, aggregate *eventstore
 	}
 }
 
-func DomainVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainVerificationFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainVerificationFailed := &DomainVerificationFailedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainVerificationFailed)
+	err := event.Unmarshal(orgDomainVerificationFailed)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-Bhm37", "unable to unmarshal org domain verification failed")
 	}
@@ -162,12 +159,12 @@ type DomainVerifiedEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainVerifiedEvent) Data() interface{} {
+func (e *DomainVerifiedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddOrgDomainUniqueConstraint(e.Domain)}
+func (e *DomainVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddOrgDomainUniqueConstraint(e.Domain)}
 }
 
 func NewDomainVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string) *DomainVerifiedEvent {
@@ -181,11 +178,11 @@ func NewDomainVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggregate
 	}
 }
 
-func DomainVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainVerified := &DomainVerifiedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainVerified)
+	err := event.Unmarshal(orgDomainVerified)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-BFSwt", "unable to unmarshal org domain verified")
 	}
@@ -199,11 +196,11 @@ type DomainPrimarySetEvent struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-func (e *DomainPrimarySetEvent) Data() interface{} {
+func (e *DomainPrimarySetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -218,11 +215,11 @@ func NewDomainPrimarySetEvent(ctx context.Context, aggregate *eventstore.Aggrega
 	}
 }
 
-func DomainPrimarySetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPrimarySetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainPrimarySet := &DomainPrimarySetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainPrimarySet)
+	err := event.Unmarshal(orgDomainPrimarySet)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-N5787", "unable to unmarshal org domain primary set")
 	}
@@ -237,15 +234,15 @@ type DomainRemovedEvent struct {
 	isVerified bool
 }
 
-func (e *DomainRemovedEvent) Data() interface{} {
+func (e *DomainRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	if !e.isVerified {
 		return nil
 	}
-	return []*eventstore.EventUniqueConstraint{NewRemoveOrgDomainUniqueConstraint(e.Domain)}
+	return []*eventstore.UniqueConstraint{NewRemoveOrgDomainUniqueConstraint(e.Domain)}
 }
 
 func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string, verified bool) *DomainRemovedEvent {
@@ -260,11 +257,11 @@ func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate,
 	}
 }
 
-func DomainRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgDomainRemoved := &DomainRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgDomainRemoved)
+	err := event.Unmarshal(orgDomainRemoved)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-BngB2", "unable to unmarshal org domain removed")
 	}

internal/repository/org/flow.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/flow"
 )
 
@@ -38,7 +37,7 @@ func NewTriggerActionsSetEvent(
 	}
 }
 
-func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func TriggerActionsSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := flow.TriggerActionsSetEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -68,7 +67,7 @@ func NewTriggerActionsCascadeRemovedEvent(
 	}
 }
 
-func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func TriggerActionsCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := flow.TriggerActionsCascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -96,7 +95,7 @@ func NewFlowClearedEvent(
 	}
 }
 
-func FlowClearedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func FlowClearedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := flow.FlowClearedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/idp.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/idp"
 )
 
@@ -80,7 +79,7 @@ func NewOAuthIDPAddedEvent(
 	}
 }
 
-func OAuthIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OAuthIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -115,7 +114,7 @@ func NewOAuthIDPChangedEvent(
 	return &OAuthIDPChangedEvent{OAuthIDPChangedEvent: *changedEvent}, nil
 }
 
-func OAuthIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OAuthIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -160,7 +159,7 @@ func NewOIDCIDPAddedEvent(
 	}
 }
 
-func OIDCIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -195,7 +194,7 @@ func NewOIDCIDPChangedEvent(
 	return &OIDCIDPChangedEvent{OIDCIDPChangedEvent: *changedEvent}, nil
 }
 
-func OIDCIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -239,7 +238,7 @@ func NewOIDCIDPMigratedAzureADEvent(
 	}
 }
 
-func OIDCIDPMigratedAzureADEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedAzureADEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPMigratedAzureADEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -279,7 +278,7 @@ func NewOIDCIDPMigratedGoogleEvent(
 	}
 }
 
-func OIDCIDPMigratedGoogleEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCIDPMigratedGoogleEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.OIDCIDPMigratedGoogleEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -322,7 +321,7 @@ func NewJWTIDPAddedEvent(
 	}
 }
 
-func JWTIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.JWTIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -357,7 +356,7 @@ func NewJWTIDPChangedEvent(
 	return &JWTIDPChangedEvent{JWTIDPChangedEvent: *changedEvent}, nil
 }
 
-func JWTIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.JWTIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -402,7 +401,7 @@ func NewAzureADIDPAddedEvent(
 	}
 }
 
-func AzureADIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AzureADIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -437,7 +436,7 @@ func NewAzureADIDPChangedEvent(
 	return &AzureADIDPChangedEvent{AzureADIDPChangedEvent: *changedEvent}, nil
 }
 
-func AzureADIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AzureADIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -478,7 +477,7 @@ func NewGitHubIDPAddedEvent(
 	}
 }
 
-func GitHubIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -513,7 +512,7 @@ func NewGitHubIDPChangedEvent(
 	return &GitHubIDPChangedEvent{GitHubIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitHubIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -560,7 +559,7 @@ func NewGitHubEnterpriseIDPAddedEvent(
 	}
 }
 
-func GitHubEnterpriseIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubEnterpriseIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -595,7 +594,7 @@ func NewGitHubEnterpriseIDPChangedEvent(
 	return &GitHubEnterpriseIDPChangedEvent{GitHubEnterpriseIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitHubEnterpriseIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitHubEnterpriseIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -636,7 +635,7 @@ func NewGitLabIDPAddedEvent(
 	}
 }
 
-func GitLabIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -671,7 +670,7 @@ func NewGitLabIDPChangedEvent(
 	return &GitLabIDPChangedEvent{GitLabIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitLabIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -714,7 +713,7 @@ func NewGitLabSelfHostedIDPAddedEvent(
 	}
 }
 
-func GitLabSelfHostedIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabSelfHostedIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -749,7 +748,7 @@ func NewGitLabSelfHostedIDPChangedEvent(
 	return &GitLabSelfHostedIDPChangedEvent{GitLabSelfHostedIDPChangedEvent: *changedEvent}, nil
 }
 
-func GitLabSelfHostedIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GitLabSelfHostedIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -790,7 +789,7 @@ func NewGoogleIDPAddedEvent(
 	}
 }
 
-func GoogleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GoogleIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -825,7 +824,7 @@ func NewGoogleIDPChangedEvent(
 	return &GoogleIDPChangedEvent{GoogleIDPChangedEvent: *changedEvent}, nil
 }
 
-func GoogleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.GoogleIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -880,7 +879,7 @@ func NewLDAPIDPAddedEvent(
 	}
 }
 
-func LDAPIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.LDAPIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -915,7 +914,7 @@ func NewLDAPIDPChangedEvent(
 	return &LDAPIDPChangedEvent{LDAPIDPChangedEvent: *changedEvent}, nil
 }
 
-func LDAPIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.LDAPIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -960,7 +959,7 @@ func NewAppleIDPAddedEvent(
 	}
 }
 
-func AppleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AppleIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -995,7 +994,7 @@ func NewAppleIDPChangedEvent(
 	return &AppleIDPChangedEvent{AppleIDPChangedEvent: *changedEvent}, nil
 }
 
-func AppleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.AppleIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1040,7 +1039,7 @@ func NewSAMLIDPAddedEvent(
 	}
 }
 
-func SAMLIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.SAMLIDPAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1074,7 +1073,7 @@ func NewSAMLIDPChangedEvent(
 	return &SAMLIDPChangedEvent{SAMLIDPChangedEvent: *changedEvent}, nil
 }
 
-func SAMLIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.SAMLIDPChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -1104,11 +1103,11 @@ func NewIDPRemovedEvent(
 	}
 }
 
-func (e *IDPRemovedEvent) Data() interface{} {
+func (e *IDPRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func IDPRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idp.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/idp_config.go

@@ -3,10 +3,8 @@ package org
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -48,7 +46,7 @@ func NewIDPConfigAddedEvent(
 	}
 }
 
-func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -82,7 +80,7 @@ func NewIDPConfigChangedEvent(
 	return &IDPConfigChangedEvent{IDPConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -115,7 +113,7 @@ func NewIDPConfigRemovedEvent(
 	}
 }
 
-func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -146,7 +144,7 @@ func NewIDPConfigDeactivatedEvent(
 	}
 }
 
-func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigDeactivatedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -177,7 +175,7 @@ func NewIDPConfigReactivatedEvent(
 	}
 }
 
-func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPConfigReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.IDPConfigReactivatedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/idp_jwt_config.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -44,7 +42,7 @@ func NewIDPJWTConfigAddedEvent(
 	}
 }
 
-func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPJWTConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.JWTConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -77,7 +75,7 @@ func NewIDPJWTConfigChangedEvent(
 	return &IDPJWTConfigChangedEvent{JWTConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPJWTConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.JWTConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/idp_oidc_config.go

@@ -3,11 +3,9 @@ package org
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/idpconfig"
 )
 
@@ -54,7 +52,7 @@ func NewIDPOIDCConfigAddedEvent(
 	}
 }
 
-func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPOIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.OIDCConfigAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -87,7 +85,7 @@ func NewIDPOIDCConfigChangedEvent(
 	return &IDPOIDCConfigChangedEvent{OIDCConfigChangedEvent: *changeEvent}, nil
 }
 
-func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IDPOIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := idpconfig.OIDCConfigChangedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/member.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/member"
 )
 
@@ -39,7 +37,7 @@ func NewMemberAddedEvent(
 	}
 }
 
-func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.MemberAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -72,7 +70,7 @@ func NewMemberChangedEvent(
 	}
 }
 
-func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.ChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -102,7 +100,7 @@ func NewMemberRemovedEvent(
 	}
 }
 
-func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -132,7 +130,7 @@ func NewMemberCascadeRemovedEvent(
 	}
 }
 
-func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.CascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/metadata.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/metadata"
 )
 
@@ -30,7 +29,7 @@ func NewMetadataSetEvent(ctx context.Context, aggregate *eventstore.Aggregate, k
 	}
 }
 
-func MetadataSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MetadataSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := metadata.SetEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -54,7 +53,7 @@ func NewMetadataRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregat
 	}
 }
 
-func MetadataRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MetadataRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := metadata.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -78,7 +77,7 @@ func NewMetadataRemovedAllEvent(ctx context.Context, aggregate *eventstore.Aggre
 	}
 }
 
-func MetadataRemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MetadataRemovedAllEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := metadata.RemovedAllEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/org.go

@@ -2,12 +2,10 @@ package org
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/project"
 	"github.com/zitadel/zitadel/internal/repository/user"
 )
@@ -21,15 +19,15 @@ const (
 	OrgRemovedEventType     = orgEventTypePrefix + "removed"
 )
 
-func NewAddOrgNameUniqueConstraint(orgName string) *eventstore.EventUniqueConstraint {
+func NewAddOrgNameUniqueConstraint(orgName string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		uniqueOrgname,
 		orgName,
 		"Errors.Org.AlreadyExists")
 }
 
-func NewRemoveOrgNameUniqueConstraint(orgName string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveOrgNameUniqueConstraint(orgName string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		uniqueOrgname,
 		orgName)
 }
@@ -40,12 +38,12 @@ type OrgAddedEvent struct {
 	Name string `json:"name,omitempty"`
 }
 
-func (e *OrgAddedEvent) Data() interface{} {
+func (e *OrgAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OrgAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddOrgNameUniqueConstraint(e.Name)}
+func (e *OrgAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddOrgNameUniqueConstraint(e.Name)}
 }
 
 func NewOrgAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name string) *OrgAddedEvent {
@@ -59,11 +57,11 @@ func NewOrgAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name
 	}
 }
 
-func OrgAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OrgAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgAdded := &OrgAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgAdded)
+	err := event.Unmarshal(orgAdded)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added")
 	}
@@ -78,12 +76,12 @@ type OrgChangedEvent struct {
 	oldName string `json:"-"`
 }
 
-func (e *OrgChangedEvent) Data() interface{} {
+func (e *OrgChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OrgChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{
+func (e *OrgChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{
 		NewRemoveOrgNameUniqueConstraint(e.oldName),
 		NewAddOrgNameUniqueConstraint(e.Name),
 	}
@@ -101,11 +99,11 @@ func NewOrgChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate, ol
 	}
 }
 
-func OrgChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OrgChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	orgChanged := &OrgChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, orgChanged)
+	err := event.Unmarshal(orgChanged)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added")
 	}
@@ -117,11 +115,11 @@ type OrgDeactivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *OrgDeactivatedEvent) Data() interface{} {
+func (e *OrgDeactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OrgDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OrgDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -135,7 +133,7 @@ func NewOrgDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate
 	}
 }
 
-func OrgDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OrgDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &OrgDeactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -145,11 +143,11 @@ type OrgReactivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *OrgReactivatedEvent) Data() interface{} {
+func (e *OrgReactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OrgReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OrgReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -163,7 +161,7 @@ func NewOrgReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate
 	}
 }
 
-func OrgReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OrgReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &OrgReactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -179,12 +177,12 @@ type OrgRemovedEvent struct {
 	samlEntityIDs        []string
 }
 
-func (e *OrgRemovedEvent) Data() interface{} {
+func (e *OrgRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	constraints := []*eventstore.EventUniqueConstraint{
+func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	constraints := []*eventstore.UniqueConstraint{
 		NewRemoveOrgNameUniqueConstraint(e.name),
 	}
 	for _, name := range e.usernames {
@@ -218,7 +216,7 @@ func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, na
 	}
 }
 
-func OrgRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OrgRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &OrgRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/org/policy_domain.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -39,7 +37,7 @@ func NewDomainPolicyAddedEvent(
 	}
 }
 
-func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -70,7 +68,7 @@ func NewDomainPolicyChangedEvent(
 	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
 }
 
-func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -97,7 +95,7 @@ func NewDomainPolicyRemovedEvent(
 	}
 }
 
-func DomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_label.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -68,7 +67,7 @@ func NewLabelPolicyAddedEvent(
 	}
 }
 
-func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -99,7 +98,7 @@ func NewLabelPolicyChangedEvent(
 	return &LabelPolicyChangedEvent{LabelPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -126,7 +125,7 @@ func NewLabelPolicyRemovedEvent(
 	}
 }
 
-func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -153,7 +152,7 @@ func NewLabelPolicyActivatedEvent(
 	}
 }
 
-func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyActivatedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -182,7 +181,7 @@ func NewLabelPolicyLogoAddedEvent(
 	}
 }
 
-func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -211,7 +210,7 @@ func NewLabelPolicyLogoRemovedEvent(
 	}
 }
 
-func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -240,7 +239,7 @@ func NewLabelPolicyIconAddedEvent(
 	}
 }
 
-func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -269,7 +268,7 @@ func NewLabelPolicyIconRemovedEvent(
 	}
 }
 
-func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -298,7 +297,7 @@ func NewLabelPolicyLogoDarkAddedEvent(
 	}
 }
 
-func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoDarkAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -327,7 +326,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(
 	}
 }
 
-func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyLogoDarkRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -356,7 +355,7 @@ func NewLabelPolicyIconDarkAddedEvent(
 	}
 }
 
-func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconDarkAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -385,7 +384,7 @@ func NewLabelPolicyIconDarkRemovedEvent(
 	}
 }
 
-func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyIconDarkRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -414,7 +413,7 @@ func NewLabelPolicyFontAddedEvent(
 	}
 }
 
-func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyFontAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -443,7 +442,7 @@ func NewLabelPolicyFontRemovedEvent(
 	}
 }
 
-func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyFontRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -456,11 +455,11 @@ type LabelPolicyAssetsRemovedEvent struct {
 	policy.LabelPolicyAssetsRemovedEvent
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) Data() interface{} {
+func (e *LabelPolicyAssetsRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -478,7 +477,7 @@ func NewLabelPolicyAssetsRemovedEvent(
 	}
 }
 
-func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LabelPolicyAssetsRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_login.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -69,7 +67,7 @@ func NewLoginPolicyAddedEvent(
 	}
 }
 
-func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LoginPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -100,7 +98,7 @@ func NewLoginPolicyChangedEvent(
 	return &LoginPolicyChangedEvent{LoginPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LoginPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -127,7 +125,7 @@ func NewLoginPolicyRemovedEvent(
 	}
 }
 
-func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LoginPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_login_factors.go

@@ -3,10 +3,8 @@ package org
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -37,7 +35,7 @@ func NewLoginPolicySecondFactorAddedEvent(
 	}
 }
 
-func SecondFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorAddedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.SecondFactorAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -68,7 +66,7 @@ func NewLoginPolicySecondFactorRemovedEvent(
 	}
 }
 
-func SecondFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorRemovedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.SecondFactorRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -98,7 +96,7 @@ func NewLoginPolicyMultiFactorAddedEvent(
 	}
 }
 
-func MultiFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorAddedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MultiFactorAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -129,7 +127,7 @@ func NewLoginPolicyMultiFactorRemovedEvent(
 	}
 }
 
-func MultiFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorRemovedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MultiFactorRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_login_identity_provider.go

@@ -3,10 +3,8 @@ package org
 import (
 	"context"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -38,7 +36,7 @@ func NewIdentityProviderAddedEvent(
 	}
 }
 
-func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -68,7 +66,7 @@ func NewIdentityProviderRemovedEvent(
 	}
 }
 
-func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderRemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -95,7 +93,7 @@ func NewIdentityProviderCascadeRemovedEvent(
 	}
 }
 
-func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.IdentityProviderCascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_mail_template.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -31,7 +29,7 @@ func NewMailTemplateAddedEvent(
 	}
 }
 
-func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTemplateAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -59,7 +57,7 @@ func NewMailTemplateChangedEvent(
 	return &MailTemplateChangedEvent{MailTemplateChangedEvent: *changedEvent}, nil
 }
 
-func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTemplateChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -83,7 +81,7 @@ func NewMailTemplateRemovedEvent(
 	}
 }
 
-func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTemplateRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_mail_text.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -45,7 +43,7 @@ func NewMailTextAddedEvent(
 	}
 }
 
-func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTextAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -77,7 +75,7 @@ func NewMailTextChangedEvent(
 	return &MailTextChangedEvent{MailTextChangedEvent: *changedEvent}, nil
 }
 
-func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTextChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -105,7 +103,7 @@ func NewMailTextRemovedEvent(
 	}
 }
 
-func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.MailTextRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_notification.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -34,7 +33,7 @@ func NewNotificationPolicyAddedEvent(
 	}
 }
 
-func NotificationPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.NotificationPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -65,7 +64,7 @@ func NewNotificationPolicyChangedEvent(
 	return &NotificationPolicyChangedEvent{NotificationPolicyChangedEvent: *changedEvent}, nil
 }
 
-func NotificationPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.NotificationPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -92,7 +91,7 @@ func NewNotificationPolicyRemovedEvent(
 	}
 }
 
-func NotificationPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.NotificationPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_password_age.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -36,7 +34,7 @@ func NewPasswordAgePolicyAddedEvent(
 	}
 }
 
-func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordAgePolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -67,7 +65,7 @@ func NewPasswordAgePolicyChangedEvent(
 	return &PasswordAgePolicyChangedEvent{PasswordAgePolicyChangedEvent: *changedEvent}, nil
 }
 
-func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordAgePolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -94,7 +92,7 @@ func NewPasswordAgePolicyRemovedEvent(
 	}
 }
 
-func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordAgePolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_password_complexity.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -42,7 +40,7 @@ func NewPasswordComplexityPolicyAddedEvent(
 	}
 }
 
-func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordComplexityPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -73,7 +71,7 @@ func NewPasswordComplexityPolicyChangedEvent(
 	return &PasswordComplexityPolicyChangedEvent{PasswordComplexityPolicyChangedEvent: *changedEvent}, nil
 }
 
-func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordComplexityPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -100,7 +98,7 @@ func NewPasswordComplexityPolicyRemovedEvent(
 	}
 }
 
-func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PasswordComplexityPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_password_lockout.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -36,7 +34,7 @@ func NewLockoutPolicyAddedEvent(
 	}
 }
 
-func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LockoutPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -67,7 +65,7 @@ func NewLockoutPolicyChangedEvent(
 	return &LockoutPolicyChangedEvent{LockoutPolicyChangedEvent: *changedEvent}, nil
 }
 
-func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LockoutPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -94,7 +92,7 @@ func NewLockoutPolicyRemovedEvent(
 	}
 }
 
-func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.LockoutPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/org/policy_privacy.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/policy"
 )
 
@@ -40,7 +39,7 @@ func NewPrivacyPolicyAddedEvent(
 	}
 }
 
-func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PrivacyPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -71,7 +70,7 @@ func NewPrivacyPolicyChangedEvent(
 	return &PrivacyPolicyChangedEvent{PrivacyPolicyChangedEvent: *changedEvent}, nil
 }
 
-func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PrivacyPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -98,7 +97,7 @@ func NewPrivacyPolicyRemovedEvent(
 	}
 }
 
-func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := policy.PrivacyPolicyRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/policy/custom_text.go

@@ -1,13 +1,10 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"golang.org/x/text/language"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -26,11 +23,11 @@ type CustomTextSetEvent struct {
 	Text     string       `json:"text,omitempty"`
 }
 
-func (e *CustomTextSetEvent) Data() interface{} {
+func (e *CustomTextSetEvent) Payload() interface{} {
 	return e
 }
 
-func (e *CustomTextSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -50,12 +47,12 @@ func NewCustomTextSetEvent(
 	}
 }
 
-func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-28dwe", "unable to unmarshal custom text")
 	}
@@ -71,11 +68,11 @@ type CustomTextRemovedEvent struct {
 	Language language.Tag `json:"language,omitempty"`
 }
 
-func (e *CustomTextRemovedEvent) Data() interface{} {
+func (e *CustomTextRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *CustomTextRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -88,12 +85,12 @@ func NewCustomTextRemovedEvent(base *eventstore.BaseEvent, template, key string,
 	}
 }
 
-func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-28sMf", "unable to unmarshal custom text removed")
 	}
@@ -108,11 +105,11 @@ type CustomTextTemplateRemovedEvent struct {
 	Language language.Tag `json:"language,omitempty"`
 }
 
-func (e *CustomTextTemplateRemovedEvent) Data() interface{} {
+func (e *CustomTextTemplateRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *CustomTextTemplateRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextTemplateRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -124,12 +121,12 @@ func NewCustomTextTemplateRemovedEvent(base *eventstore.BaseEvent, template stri
 	}
 }
 
-func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextTemplateRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-mKKRs", "unable to unmarshal custom text message removed")
 	}

internal/repository/policy/label.go

@@ -1,11 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/asset"
 )
 
@@ -48,11 +45,11 @@ type LabelPolicyAddedEvent struct {
 	DisableWatermark    bool   `json:"disableMsgPopup,omitempty"`
 }
 
-func (e *LabelPolicyAddedEvent) Data() interface{} {
+func (e *LabelPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -87,12 +84,12 @@ func NewLabelPolicyAddedEvent(
 	}
 }
 
-func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LabelPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy")
 	}
@@ -116,11 +113,11 @@ type LabelPolicyChangedEvent struct {
 	DisableWatermark    *bool   `json:"disableWatermark,omitempty"`
 }
 
-func (e *LabelPolicyChangedEvent) Data() interface{} {
+func (e *LabelPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -208,12 +205,12 @@ func ChangeDisableWatermark(disableWatermark bool) func(*LabelPolicyChangedEvent
 	}
 }
 
-func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LabelPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-qhfFb", "unable to unmarshal label policy")
 	}
@@ -225,11 +222,11 @@ type LabelPolicyActivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *LabelPolicyActivatedEvent) Data() interface{} {
+func (e *LabelPolicyActivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyActivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyActivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -239,7 +236,7 @@ func NewLabelPolicyActivatedEvent(base *eventstore.BaseEvent) *LabelPolicyActiva
 	}
 }
 
-func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyActivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -249,11 +246,11 @@ type LabelPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *LabelPolicyRemovedEvent) Data() interface{} {
+func (e *LabelPolicyRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -263,7 +260,7 @@ func NewLabelPolicyRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyRemovedE
 	}
 }
 
-func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -273,11 +270,11 @@ type LabelPolicyLogoAddedEvent struct {
 	asset.AddedEvent
 }
 
-func (e *LabelPolicyLogoAddedEvent) Data() interface{} {
+func (e *LabelPolicyLogoAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyLogoAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -287,7 +284,7 @@ func NewLabelPolicyLogoAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }
 
-func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -300,11 +297,11 @@ type LabelPolicyLogoRemovedEvent struct {
 	asset.RemovedEvent
 }
 
-func (e *LabelPolicyLogoRemovedEvent) Data() interface{} {
+func (e *LabelPolicyLogoRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyLogoRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -314,7 +311,7 @@ func NewLabelPolicyLogoRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }
 
-func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -327,11 +324,11 @@ type LabelPolicyIconAddedEvent struct {
 	asset.AddedEvent
 }
 
-func (e *LabelPolicyIconAddedEvent) Data() interface{} {
+func (e *LabelPolicyIconAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyIconAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -341,7 +338,7 @@ func NewLabelPolicyIconAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }
 
-func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -354,11 +351,11 @@ type LabelPolicyIconRemovedEvent struct {
 	asset.RemovedEvent
 }
 
-func (e *LabelPolicyIconRemovedEvent) Data() interface{} {
+func (e *LabelPolicyIconRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyIconRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -368,7 +365,7 @@ func NewLabelPolicyIconRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }
 
-func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -381,11 +378,11 @@ type LabelPolicyLogoDarkAddedEvent struct {
 	asset.AddedEvent
 }
 
-func (e *LabelPolicyLogoDarkAddedEvent) Data() interface{} {
+func (e *LabelPolicyLogoDarkAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyLogoDarkAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoDarkAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -395,7 +392,7 @@ func NewLabelPolicyLogoDarkAddedEvent(base *eventstore.BaseEvent, storageKey str
 	}
 }
 
-func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -408,11 +405,11 @@ type LabelPolicyLogoDarkRemovedEvent struct {
 	asset.RemovedEvent
 }
 
-func (e *LabelPolicyLogoDarkRemovedEvent) Data() interface{} {
+func (e *LabelPolicyLogoDarkRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyLogoDarkRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoDarkRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -422,7 +419,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s
 	}
 }
 
-func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -435,11 +432,11 @@ type LabelPolicyIconDarkAddedEvent struct {
 	asset.AddedEvent
 }
 
-func (e *LabelPolicyIconDarkAddedEvent) Data() interface{} {
+func (e *LabelPolicyIconDarkAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyIconDarkAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconDarkAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -449,7 +446,7 @@ func NewLabelPolicyIconDarkAddedEvent(base *eventstore.BaseEvent, storageKey str
 	}
 }
 
-func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -462,11 +459,11 @@ type LabelPolicyIconDarkRemovedEvent struct {
 	asset.RemovedEvent
 }
 
-func (e *LabelPolicyIconDarkRemovedEvent) Data() interface{} {
+func (e *LabelPolicyIconDarkRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyIconDarkRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconDarkRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -476,7 +473,7 @@ func NewLabelPolicyIconDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s
 	}
 }
 
-func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -489,11 +486,11 @@ type LabelPolicyFontAddedEvent struct {
 	asset.AddedEvent
 }
 
-func (e *LabelPolicyFontAddedEvent) Data() interface{} {
+func (e *LabelPolicyFontAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyFontAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyFontAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -503,7 +500,7 @@ func NewLabelPolicyFontAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }
 
-func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -516,11 +513,11 @@ type LabelPolicyFontRemovedEvent struct {
 	asset.RemovedEvent
 }
 
-func (e *LabelPolicyFontRemovedEvent) Data() interface{} {
+func (e *LabelPolicyFontRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LabelPolicyFontRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyFontRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -530,7 +527,7 @@ func NewLabelPolicyFontRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }
 
-func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -543,11 +540,11 @@ type LabelPolicyAssetsRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) Data() interface{} {
+func (e *LabelPolicyAssetsRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -557,7 +554,7 @@ func NewLabelPolicyAssetsRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyAs
 	}
 }
 
-func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyAssetsRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/login.go

@@ -1,13 +1,11 @@
 package policy
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -39,11 +37,11 @@ type LoginPolicyAddedEvent struct {
 	MultiFactorCheckLifetime   time.Duration           `json:"multiFactorCheckLifetime,omitempty"`
 }
 
-func (e *LoginPolicyAddedEvent) Data() interface{} {
+func (e *LoginPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LoginPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -89,12 +87,12 @@ func NewLoginPolicyAddedEvent(
 	}
 }
 
-func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LoginPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-nWndT", "unable to unmarshal policy")
 	}
@@ -124,11 +122,11 @@ type LoginPolicyChangedEvent struct {
 	MultiFactorCheckLifetime   *time.Duration           `json:"multiFactorCheckLifetime,omitempty"`
 }
 
-func (e *LoginPolicyChangedEvent) Data() interface{} {
+func (e *LoginPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LoginPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -252,12 +250,12 @@ func ChangeDisableLoginWithPhone(DisableLoginWithPhone bool) func(*LoginPolicyCh
 	}
 }
 
-func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LoginPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy")
 	}
@@ -269,11 +267,11 @@ type LoginPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *LoginPolicyRemovedEvent) Data() interface{} {
+func (e *LoginPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *LoginPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -283,7 +281,7 @@ func NewLoginPolicyRemovedEvent(base *eventstore.BaseEvent) *LoginPolicyRemovedE
 	}
 }
 
-func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LoginPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/mail_template.go

@@ -1,11 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -22,11 +19,11 @@ type MailTemplateAddedEvent struct {
 	Template []byte `json:"template,omitempty"`
 }
 
-func (e *MailTemplateAddedEvent) Data() interface{} {
+func (e *MailTemplateAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MailTemplateAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -40,12 +37,12 @@ func NewMailTemplateAddedEvent(
 	}
 }
 
-func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTemplateAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail template")
 	}
@@ -59,11 +56,11 @@ type MailTemplateChangedEvent struct {
 	Template *[]byte `json:"template,omitempty"`
 }
 
-func (e *MailTemplateChangedEvent) Data() interface{} {
+func (e *MailTemplateChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MailTemplateChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -91,12 +88,12 @@ func ChangeTemplate(template []byte) func(*MailTemplateChangedEvent) {
 	}
 }
 
-func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTemplateChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-3uu8K", "unable to unmarshal mail template policy")
 	}
@@ -108,11 +105,11 @@ type MailTemplateRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *MailTemplateRemovedEvent) Data() interface{} {
+func (e *MailTemplateRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *MailTemplateRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -122,7 +119,7 @@ func NewMailTemplateRemovedEvent(base *eventstore.BaseEvent) *MailTemplateRemove
 	}
 }
 
-func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &MailTemplateRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/mail_text.go

@@ -1,12 +1,10 @@
 package policy
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -17,15 +15,15 @@ const (
 	MailTextPolicyRemovedEventType = mailTextPolicyPrefix + "removed"
 )
 
-func NewAddMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.EventUniqueConstraint {
+func NewAddMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueMailText,
 		fmt.Sprintf("%v:%v:%v", aggregateID, mailTextType, langugage),
 		"Errors.Org.AlreadyExists")
 }
 
-func NewRemoveMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueMailText,
 		fmt.Sprintf("%v:%v:%v", aggregateID, mailTextType, langugage))
 }
@@ -43,12 +41,12 @@ type MailTextAddedEvent struct {
 	ButtonText   string `json:"buttonText,omitempty"`
 }
 
-func (e *MailTextAddedEvent) Data() interface{} {
+func (e *MailTextAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MailTextAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
+func (e *MailTextAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
 }
 
 func NewMailTextAddedEvent(
@@ -75,12 +73,12 @@ func NewMailTextAddedEvent(
 	}
 }
 
-func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTextAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail text policy")
 	}
@@ -101,11 +99,11 @@ type MailTextChangedEvent struct {
 	ButtonText   *string `json:"buttonText,omitempty"`
 }
 
-func (e *MailTextChangedEvent) Data() interface{} {
+func (e *MailTextChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MailTextChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTextChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -167,12 +165,12 @@ func ChangeButtonText(buttonText string) func(*MailTextChangedEvent) {
 	}
 }
 
-func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTextChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-bn88u", "unable to unmarshal mail text policy")
 	}
@@ -187,12 +185,12 @@ type MailTextRemovedEvent struct {
 	Language     string `json:"language,omitempty"`
 }
 
-func (e *MailTextRemovedEvent) Data() interface{} {
+func (e *MailTextRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *MailTextRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
+func (e *MailTextRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
 }
 
 func NewMailTextRemovedEvent(base *eventstore.BaseEvent, mailTextType, language string) *MailTextRemovedEvent {
@@ -203,7 +201,7 @@ func NewMailTextRemovedEvent(base *eventstore.BaseEvent, mailTextType, language
 	}
 }
 
-func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &MailTextRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_domain.go

@@ -1,12 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -23,11 +19,11 @@ type DomainPolicyAddedEvent struct {
 	SMTPSenderAddressMatchesInstanceDomain bool `json:"smtpSenderAddressMatchesInstanceDomain,omitempty"`
 }
 
-func (e *DomainPolicyAddedEvent) Data() interface{} {
+func (e *DomainPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -46,12 +42,12 @@ func NewDomainPolicyAddedEvent(
 	}
 }
 
-func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DomainPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-TvSmA", "unable to unmarshal policy")
 	}
@@ -67,11 +63,11 @@ type DomainPolicyChangedEvent struct {
 	SMTPSenderAddressMatchesInstanceDomain *bool `json:"smtpSenderAddressMatchesInstanceDomain,omitempty"`
 }
 
-func (e *DomainPolicyChangedEvent) Data() interface{} {
+func (e *DomainPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *DomainPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -111,12 +107,12 @@ func ChangeSMTPSenderAddressMatchesInstanceDomain(smtpSenderAddressMatchesInstan
 	}
 }
 
-func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DomainPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-0Pl9d", "unable to unmarshal policy")
 	}
@@ -128,11 +124,11 @@ type DomainPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *DomainPolicyRemovedEvent) Data() interface{} {
+func (e *DomainPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *DomainPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -142,7 +138,7 @@ func NewDomainPolicyRemovedEvent(base *eventstore.BaseEvent) *DomainPolicyRemove
 	}
 }
 
-func DomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &DomainPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_login_factors.go

@@ -1,12 +1,9 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -35,12 +32,12 @@ func NewSecondFactorAddedEvent(
 	}
 }
 
-func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecondFactorAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-Lp0dE", "unable to unmarshal policy")
 	}
@@ -48,11 +45,11 @@ func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, er
 	return e, nil
 }
 
-func (e *SecondFactorAddedEvent) Data() interface{} {
+func (e *SecondFactorAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecondFactorAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecondFactorAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -71,12 +68,12 @@ func NewSecondFactorRemovedEvent(
 	}
 }
 
-func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecondFactorRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5M9gd", "unable to unmarshal policy")
 	}
@@ -84,11 +81,11 @@ func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event,
 	return e, nil
 }
 
-func (e *SecondFactorRemovedEvent) Data() interface{} {
+func (e *SecondFactorRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *SecondFactorRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecondFactorRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -108,12 +105,12 @@ func NewMultiFactorAddedEvent(
 	}
 }
 
-func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MultiFactorAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5Ms90", "unable to unmarshal policy")
 	}
@@ -121,11 +118,11 @@ func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, err
 	return e, nil
 }
 
-func (e *MultiFactorAddedEvent) Data() interface{} {
+func (e *MultiFactorAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MultiFactorAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MultiFactorAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -144,12 +141,12 @@ func NewMultiFactorRemovedEvent(
 	}
 }
 
-func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MultiFactorRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-1N8sd", "unable to unmarshal policy")
 	}
@@ -157,10 +154,10 @@ func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, e
 	return e, nil
 }
 
-func (e *MultiFactorRemovedEvent) Data() interface{} {
+func (e *MultiFactorRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *MultiFactorRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MultiFactorRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

internal/repository/policy/policy_login_identity_provider.go

@@ -1,12 +1,9 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -23,11 +20,11 @@ type IdentityProviderAddedEvent struct {
 	IDPProviderType domain.IdentityProviderType `json:"idpProviderType,omitempty"`
 }
 
-func (e *IdentityProviderAddedEvent) Data() interface{} {
+func (e *IdentityProviderAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IdentityProviderAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -44,12 +41,12 @@ func NewIdentityProviderAddedEvent(
 	}
 }
 
-func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-bfNnp", "Errors.Internal")
 	}
@@ -63,11 +60,11 @@ type IdentityProviderRemovedEvent struct {
 	IDPConfigID string `json:"idpConfigId"`
 }
 
-func (e *IdentityProviderRemovedEvent) Data() interface{} {
+func (e *IdentityProviderRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IdentityProviderRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -81,12 +78,12 @@ func NewIdentityProviderRemovedEvent(
 	}
 }
 
-func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-6H0KQ", "Errors.Internal")
 	}
@@ -100,11 +97,11 @@ type IdentityProviderCascadeRemovedEvent struct {
 	IDPConfigID string `json:"idpConfigId"`
 }
 
-func (e *IdentityProviderCascadeRemovedEvent) Data() interface{} {
+func (e *IdentityProviderCascadeRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *IdentityProviderCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -118,12 +115,12 @@ func NewIdentityProviderCascadeRemovedEvent(
 	}
 }
 
-func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderCascadeRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-7M9fs", "Errors.Internal")
 	}

internal/repository/policy/policy_notification.go

@@ -1,11 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -20,11 +17,11 @@ type NotificationPolicyAddedEvent struct {
 	PasswordChange bool `json:"passwordChange,omitempty"`
 }
 
-func (e *NotificationPolicyAddedEvent) Data() interface{} {
+func (e *NotificationPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *NotificationPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -38,12 +35,12 @@ func NewNotificationPolicyAddedEvent(
 	}
 }
 
-func NotificationPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &NotificationPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-0sp2nios", "unable to unmarshal policy")
 	}
@@ -57,11 +54,11 @@ type NotificationPolicyChangedEvent struct {
 	PasswordChange *bool `json:"passwordChange,omitempty"`
 }
 
-func (e *NotificationPolicyChangedEvent) Data() interface{} {
+func (e *NotificationPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *NotificationPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -89,12 +86,12 @@ func ChangePasswordChange(passwordChange bool) func(*NotificationPolicyChangedEv
 	}
 }
 
-func NotificationPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &NotificationPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-09s2oss", "unable to unmarshal policy")
 	}
@@ -106,11 +103,11 @@ type NotificationPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *NotificationPolicyRemovedEvent) Data() interface{} {
+func (e *NotificationPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *NotificationPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -120,7 +117,7 @@ func NewNotificationPolicyRemovedEvent(base *eventstore.BaseEvent) *Notification
 	}
 }
 
-func NotificationPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &NotificationPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_password_age.go

@@ -1,11 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -21,11 +18,11 @@ type PasswordAgePolicyAddedEvent struct {
 	MaxAgeDays     uint64 `json:"maxAgeDays,omitempty"`
 }
 
-func (e *PasswordAgePolicyAddedEvent) Data() interface{} {
+func (e *PasswordAgePolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PasswordAgePolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -42,12 +39,12 @@ func NewPasswordAgePolicyAddedEvent(
 	}
 }
 
-func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordAgePolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-T3mGp", "unable to unmarshal policy")
 	}
@@ -62,11 +59,11 @@ type PasswordAgePolicyChangedEvent struct {
 	MaxAgeDays     *uint64 `json:"maxAgeDays,omitempty"`
 }
 
-func (e *PasswordAgePolicyChangedEvent) Data() interface{} {
+func (e *PasswordAgePolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PasswordAgePolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -100,12 +97,12 @@ func ChangeMaxAgeDays(maxAgeDays uint64) func(*PasswordAgePolicyChangedEvent) {
 	}
 }
 
-func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordAgePolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-PqaVq", "unable to unmarshal policy")
 	}
@@ -117,11 +114,11 @@ type PasswordAgePolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *PasswordAgePolicyRemovedEvent) Data() interface{} {
+func (e *PasswordAgePolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *PasswordAgePolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -131,7 +128,7 @@ func NewPasswordAgePolicyRemovedEvent(base *eventstore.BaseEvent) *PasswordAgePo
 	}
 }
 
-func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PasswordAgePolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_password_complexity.go

@@ -1,12 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -25,11 +21,11 @@ type PasswordComplexityPolicyAddedEvent struct {
 	HasSymbol    bool   `json:"hasSymbol,omitempty"`
 }
 
-func (e *PasswordComplexityPolicyAddedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PasswordComplexityPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -51,12 +47,12 @@ func NewPasswordComplexityPolicyAddedEvent(
 	}
 }
 
-func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordComplexityPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-wYxlM", "unable to unmarshal policy")
 	}
@@ -74,11 +70,11 @@ type PasswordComplexityPolicyChangedEvent struct {
 	HasSymbol    *bool   `json:"hasSymbol,omitempty"`
 }
 
-func (e *PasswordComplexityPolicyChangedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PasswordComplexityPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -130,12 +126,12 @@ func ChangeHasSymbol(hasSymbol bool) func(*PasswordComplexityPolicyChangedEvent)
 	}
 }
 
-func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordComplexityPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-zBGB0", "unable to unmarshal policy")
 	}
@@ -147,11 +143,11 @@ type PasswordComplexityPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *PasswordComplexityPolicyRemovedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *PasswordComplexityPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -161,7 +157,7 @@ func NewPasswordComplexityPolicyRemovedEvent(base *eventstore.BaseEvent) *Passwo
 	}
 }
 
-func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PasswordComplexityPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_password_lockout.go

@@ -1,12 +1,8 @@
 package policy
 
 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -22,11 +18,11 @@ type LockoutPolicyAddedEvent struct {
 	ShowLockOutFailures bool   `json:"showLockOutFailures,omitempty"`
 }
 
-func (e *LockoutPolicyAddedEvent) Data() interface{} {
+func (e *LockoutPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LockoutPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -43,12 +39,12 @@ func NewLockoutPolicyAddedEvent(
 	}
 }
 
-func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LockoutPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-8XiVd", "unable to unmarshal policy")
 	}
@@ -63,11 +59,11 @@ type LockoutPolicyChangedEvent struct {
 	ShowLockOutFailures *bool   `json:"showLockOutFailures,omitempty"`
 }
 
-func (e *LockoutPolicyChangedEvent) Data() interface{} {
+func (e *LockoutPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *LockoutPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -101,12 +97,12 @@ func ChangeShowLockOutFailures(showLockOutFailures bool) func(*LockoutPolicyChan
 	}
 }
 
-func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LockoutPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-lWGRc", "unable to unmarshal policy")
 	}
@@ -118,11 +114,11 @@ type LockoutPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *LockoutPolicyRemovedEvent) Data() interface{} {
+func (e *LockoutPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *LockoutPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -132,7 +128,7 @@ func NewLockoutPolicyRemovedEvent(base *eventstore.BaseEvent) *LockoutPolicyRemo
 	}
 }
 
-func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LockoutPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/policy/policy_privacy.go

@@ -1,12 +1,9 @@
 package policy
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -24,11 +21,11 @@ type PrivacyPolicyAddedEvent struct {
 	SupportEmail domain.EmailAddress `json:"supportEmail,omitempty"`
 }
 
-func (e *PrivacyPolicyAddedEvent) Data() interface{} {
+func (e *PrivacyPolicyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PrivacyPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -48,11 +45,11 @@ func NewPrivacyPolicyAddedEvent(
 	}
 }
 
-func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PrivacyPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-2k0fs", "unable to unmarshal policy")
 	}
@@ -69,11 +66,11 @@ type PrivacyPolicyChangedEvent struct {
 	SupportEmail *domain.EmailAddress `json:"supportEmail,omitempty"`
 }
 
-func (e *PrivacyPolicyChangedEvent) Data() interface{} {
+func (e *PrivacyPolicyChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *PrivacyPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -119,12 +116,12 @@ func ChangeSupportEmail(supportEmail domain.EmailAddress) func(*PrivacyPolicyCha
 	}
 }
 
-func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PrivacyPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-22nf9", "unable to unmarshal policy")
 	}
@@ -136,11 +133,11 @@ type PrivacyPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }
 
-func (e *PrivacyPolicyRemovedEvent) Data() interface{} {
+func (e *PrivacyPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }
 
-func (e *PrivacyPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -150,7 +147,7 @@ func NewPrivacyPolicyRemovedEvent(base *eventstore.BaseEvent) *PrivacyPolicyRemo
 	}
 }
 
-func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PrivacyPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil

internal/repository/project/api_config.go

@@ -2,14 +2,11 @@ package project
 
 import (
 	"context"
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -29,11 +26,11 @@ type APIConfigAddedEvent struct {
 	AuthMethodType domain.APIAuthMethodType `json:"authMethodType,omitempty"`
 }
 
-func (e *APIConfigAddedEvent) Data() interface{} {
+func (e *APIConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *APIConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *APIConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -77,12 +74,12 @@ func (e *APIConfigAddedEvent) Validate(cmd eventstore.Command) bool {
 	return true
 }
 
-func APIConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func APIConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &APIConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config")
 	}
@@ -98,11 +95,11 @@ type APIConfigChangedEvent struct {
 	AuthMethodType *domain.APIAuthMethodType `json:"authMethodType,omitempty"`
 }
 
-func (e *APIConfigChangedEvent) Data() interface{} {
+func (e *APIConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *APIConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *APIConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -138,12 +135,12 @@ func ChangeAPIAuthMethodType(authMethodType domain.APIAuthMethodType) func(event
 	}
 }
 
-func APIConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func APIConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &APIConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config")
 	}
@@ -158,11 +155,11 @@ type APIConfigSecretChangedEvent struct {
 	ClientSecret *crypto.CryptoValue `json:"clientSecret,omitempty"`
 }
 
-func (e *APIConfigSecretChangedEvent) Data() interface{} {
+func (e *APIConfigSecretChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *APIConfigSecretChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *APIConfigSecretChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -183,12 +180,12 @@ func NewAPIConfigSecretChangedEvent(
 	}
 }
 
-func APIConfigSecretChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func APIConfigSecretChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &APIConfigSecretChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-M893d", "unable to unmarshal api config")
 	}
@@ -202,11 +199,11 @@ type APIConfigSecretCheckSucceededEvent struct {
 	AppID string `json:"appId"`
 }
 
-func (e *APIConfigSecretCheckSucceededEvent) Data() interface{} {
+func (e *APIConfigSecretCheckSucceededEvent) Payload() interface{} {
 	return e
 }
 
-func (e *APIConfigSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *APIConfigSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -225,12 +222,12 @@ func NewAPIConfigSecretCheckSucceededEvent(
 	}
 }
 
-func APIConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func APIConfigSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &APIConfigSecretCheckSucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-837gV", "unable to unmarshal api config")
 	}
@@ -244,11 +241,11 @@ type APIConfigSecretCheckFailedEvent struct {
 	AppID string `json:"appId"`
 }
 
-func (e *APIConfigSecretCheckFailedEvent) Data() interface{} {
+func (e *APIConfigSecretCheckFailedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *APIConfigSecretCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *APIConfigSecretCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -267,12 +264,12 @@ func NewAPIConfigSecretCheckFailedEvent(
 	}
 }
 
-func APIConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func APIConfigSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &APIConfigSecretCheckFailedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-987g%", "unable to unmarshal api config")
 	}

internal/repository/project/application.go

@@ -2,13 +2,10 @@ package project
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -21,15 +18,15 @@ const (
 	ApplicationRemovedType     = applicationEventTypePrefix + "removed"
 )
 
-func NewAddApplicationUniqueConstraint(name, projectID string) *eventstore.EventUniqueConstraint {
+func NewAddApplicationUniqueConstraint(name, projectID string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueAppNameType,
 		fmt.Sprintf("%s:%s", name, projectID),
 		"Errors.Project.App.AlreadyExists")
 }
 
-func NewRemoveApplicationUniqueConstraint(name, projectID string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveApplicationUniqueConstraint(name, projectID string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueAppNameType,
 		fmt.Sprintf("%s:%s", name, projectID))
 }
@@ -41,12 +38,12 @@ type ApplicationAddedEvent struct {
 	Name  string `json:"name,omitempty"`
 }
 
-func (e *ApplicationAddedEvent) Data() interface{} {
+func (e *ApplicationAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddApplicationUniqueConstraint(e.Name, e.Aggregate().ID)}
+func (e *ApplicationAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddApplicationUniqueConstraint(e.Name, e.Aggregate().ID)}
 }
 
 func NewApplicationAddedEvent(
@@ -66,12 +63,12 @@ func NewApplicationAddedEvent(
 	}
 }
 
-func ApplicationAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "APPLICATION-Nffg2", "unable to unmarshal application")
 	}
@@ -87,12 +84,12 @@ type ApplicationChangedEvent struct {
 	oldName string
 }
 
-func (e *ApplicationChangedEvent) Data() interface{} {
+func (e *ApplicationChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{
+func (e *ApplicationChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{
 		NewRemoveApplicationUniqueConstraint(e.oldName, e.Aggregate().ID),
 		NewAddApplicationUniqueConstraint(e.Name, e.Aggregate().ID),
 	}
@@ -117,12 +114,12 @@ func NewApplicationChangedEvent(
 	}
 }
 
-func ApplicationChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "APPLICATION-9l0cs", "unable to unmarshal application")
 	}
@@ -136,11 +133,11 @@ type ApplicationDeactivatedEvent struct {
 	AppID string `json:"appId,omitempty"`
 }
 
-func (e *ApplicationDeactivatedEvent) Data() interface{} {
+func (e *ApplicationDeactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ApplicationDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -159,12 +156,12 @@ func NewApplicationDeactivatedEvent(
 	}
 }
 
-func ApplicationDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationDeactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "APPLICATION-0p9fB", "unable to unmarshal application")
 	}
@@ -178,11 +175,11 @@ type ApplicationReactivatedEvent struct {
 	AppID string `json:"appId,omitempty"`
 }
 
-func (e *ApplicationReactivatedEvent) Data() interface{} {
+func (e *ApplicationReactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ApplicationReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -201,12 +198,12 @@ func NewApplicationReactivatedEvent(
 	}
 }
 
-func ApplicationReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationReactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application")
 	}
@@ -222,12 +219,12 @@ type ApplicationRemovedEvent struct {
 	entityID string
 }
 
-func (e *ApplicationRemovedEvent) Data() interface{} {
+func (e *ApplicationRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	remove := []*eventstore.EventUniqueConstraint{NewRemoveApplicationUniqueConstraint(e.name, e.Aggregate().ID)}
+func (e *ApplicationRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	remove := []*eventstore.UniqueConstraint{NewRemoveApplicationUniqueConstraint(e.name, e.Aggregate().ID)}
 	if e.entityID != "" {
 		remove = append(remove, NewRemoveSAMLConfigEntityIDUniqueConstraint(e.entityID))
 	}
@@ -253,12 +250,12 @@ func NewApplicationRemovedEvent(
 	}
 }
 
-func ApplicationRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application")
 	}

internal/repository/project/grant.go

@@ -2,13 +2,10 @@ package project
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 var (
@@ -22,15 +19,15 @@ var (
 	GrantRemovedType        = grantEventTypePrefix + "removed"
 )
 
-func NewAddProjectGrantUniqueConstraint(grantedOrgID, projectID string) *eventstore.EventUniqueConstraint {
+func NewAddProjectGrantUniqueConstraint(grantedOrgID, projectID string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueGrantType,
 		fmt.Sprintf("%s:%s", grantedOrgID, projectID),
 		"Errors.Project.Grant.AlreadyExists")
 }
 
-func NewRemoveProjectGrantUniqueConstraint(grantedOrgID, projectID string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveProjectGrantUniqueConstraint(grantedOrgID, projectID string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueGrantType,
 		fmt.Sprintf("%s:%s", grantedOrgID, projectID))
 }
@@ -43,12 +40,12 @@ type GrantAddedEvent struct {
 	RoleKeys     []string `json:"roleKeys,omitempty"`
 }
 
-func (e *GrantAddedEvent) Data() interface{} {
+func (e *GrantAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddProjectGrantUniqueConstraint(e.GrantedOrgID, e.Aggregate().ID)}
+func (e *GrantAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddProjectGrantUniqueConstraint(e.GrantedOrgID, e.Aggregate().ID)}
 }
 
 func NewGrantAddedEvent(
@@ -70,12 +67,12 @@ func NewGrantAddedEvent(
 	}
 }
 
-func GrantAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant")
 	}
@@ -90,11 +87,11 @@ type GrantChangedEvent struct {
 	RoleKeys []string `json:"roleKeys,omitempty"`
 }
 
-func (e *GrantChangedEvent) Data() interface{} {
+func (e *GrantChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GrantChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -115,12 +112,12 @@ func NewGrantChangedEvent(
 	}
 }
 
-func GrantChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant")
 	}
@@ -135,11 +132,11 @@ type GrantCascadeChangedEvent struct {
 	RoleKeys []string `json:"roleKeys,omitempty"`
 }
 
-func (e *GrantCascadeChangedEvent) Data() interface{} {
+func (e *GrantCascadeChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantCascadeChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GrantCascadeChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -160,12 +157,12 @@ func NewGrantCascadeChangedEvent(
 	}
 }
 
-func GrantCascadeChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantCascadeChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantCascadeChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant")
 	}
@@ -179,11 +176,11 @@ type GrantDeactivateEvent struct {
 	GrantID string `json:"grantId,omitempty"`
 }
 
-func (e *GrantDeactivateEvent) Data() interface{} {
+func (e *GrantDeactivateEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantDeactivateEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GrantDeactivateEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -202,12 +199,12 @@ func NewGrantDeactivateEvent(
 	}
 }
 
-func GrantDeactivateEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantDeactivateEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantDeactivateEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant")
 	}
@@ -221,11 +218,11 @@ type GrantReactivatedEvent struct {
 	GrantID string `json:"grantId,omitempty"`
 }
 
-func (e *GrantReactivatedEvent) Data() interface{} {
+func (e *GrantReactivatedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GrantReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -244,12 +241,12 @@ func NewGrantReactivatedEvent(
 	}
 }
 
-func GrantReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantReactivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-78f7D", "unable to unmarshal project grant")
 	}
@@ -264,12 +261,12 @@ type GrantRemovedEvent struct {
 	grantedOrgID string
 }
 
-func (e *GrantRemovedEvent) Data() interface{} {
+func (e *GrantRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveProjectGrantUniqueConstraint(e.grantedOrgID, e.Aggregate().ID)}
+func (e *GrantRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveProjectGrantUniqueConstraint(e.grantedOrgID, e.Aggregate().ID)}
 }
 
 func NewGrantRemovedEvent(
@@ -289,12 +286,12 @@ func NewGrantRemovedEvent(
 	}
 }
 
-func GrantRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-28jM8", "unable to unmarshal project grant")
 	}

internal/repository/project/grant_member.go

@@ -2,13 +2,10 @@ package project
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/member"
 )
 
@@ -20,15 +17,15 @@ var (
 	GrantMemberCascadeRemovedType = grantEventTypePrefix + member.CascadeRemovedEventType
 )
 
-func NewAddProjectGrantMemberUniqueConstraint(projectID, userID, grantID string) *eventstore.EventUniqueConstraint {
+func NewAddProjectGrantMemberUniqueConstraint(projectID, userID, grantID string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueProjectGrantMemberType,
 		fmt.Sprintf("%s:%s:%s", projectID, userID, grantID),
 		"Errors.Project.Member.AlreadyExists")
 }
 
-func NewRemoveProjectGrantMemberUniqueConstraint(projectID, userID, grantID string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveProjectGrantMemberUniqueConstraint(projectID, userID, grantID string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueProjectGrantMemberType,
 		fmt.Sprintf("%s:%s:%s", projectID, userID, grantID),
 	)
@@ -42,12 +39,12 @@ type GrantMemberAddedEvent struct {
 	GrantID string   `json:"grantId"`
 }
 
-func (e *GrantMemberAddedEvent) Data() interface{} {
+func (e *GrantMemberAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantMemberAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
+func (e *GrantMemberAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
 }
 
 func NewProjectGrantMemberAddedEvent(
@@ -69,12 +66,12 @@ func NewProjectGrantMemberAddedEvent(
 	}
 }
 
-func GrantMemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantMemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantMemberAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-9f0sf", "unable to unmarshal label policy")
 	}
@@ -90,11 +87,11 @@ type GrantMemberChangedEvent struct {
 	UserID  string   `json:"userId"`
 }
 
-func (e *GrantMemberChangedEvent) Data() interface{} {
+func (e *GrantMemberChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantMemberChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *GrantMemberChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -117,12 +114,12 @@ func NewProjectGrantMemberChangedEvent(
 	}
 }
 
-func GrantMemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantMemberChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantMemberChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-39fi8", "unable to unmarshal label policy")
 	}
@@ -137,12 +134,12 @@ type GrantMemberRemovedEvent struct {
 	GrantID string `json:"grantId"`
 }
 
-func (e *GrantMemberRemovedEvent) Data() interface{} {
+func (e *GrantMemberRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantMemberRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
+func (e *GrantMemberRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
 }
 
 func NewProjectGrantMemberRemovedEvent(
@@ -162,12 +159,12 @@ func NewProjectGrantMemberRemovedEvent(
 	}
 }
 
-func GrantMemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantMemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantMemberRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-173fM", "unable to unmarshal label policy")
 	}
@@ -182,12 +179,12 @@ type GrantMemberCascadeRemovedEvent struct {
 	GrantID string `json:"grantId"`
 }
 
-func (e *GrantMemberCascadeRemovedEvent) Data() interface{} {
+func (e *GrantMemberCascadeRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *GrantMemberCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
+func (e *GrantMemberCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveProjectGrantMemberUniqueConstraint(e.Aggregate().ID, e.UserID, e.GrantID)}
 }
 
 func NewProjectGrantMemberCascadeRemovedEvent(
@@ -207,12 +204,12 @@ func NewProjectGrantMemberCascadeRemovedEvent(
 	}
 }
 
-func GrantMemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func GrantMemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &GrantMemberCascadeRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROJECT-3kfs3", "unable to unmarshal label policy")
 	}

internal/repository/project/key.go

@@ -2,14 +2,11 @@ package project
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 const (
@@ -29,11 +26,11 @@ type ApplicationKeyAddedEvent struct {
 	PublicKey      []byte              `json:"publicKey,omitempty"`
 }
 
-func (e *ApplicationKeyAddedEvent) Data() interface{} {
+func (e *ApplicationKeyAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationKeyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ApplicationKeyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -62,12 +59,12 @@ func NewApplicationKeyAddedEvent(
 	}
 }
 
-func ApplicationKeyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationKeyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &ApplicationKeyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config")
 	}
@@ -81,11 +78,11 @@ type ApplicationKeyRemovedEvent struct {
 	KeyID string `json:"keyId,omitempty"`
 }
 
-func (e *ApplicationKeyRemovedEvent) Data() interface{} {
+func (e *ApplicationKeyRemovedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *ApplicationKeyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *ApplicationKeyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -104,13 +101,13 @@ func NewApplicationKeyRemovedEvent(
 	}
 }
 
-func ApplicationKeyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func ApplicationKeyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	applicationKeyRemoved := &ApplicationKeyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, applicationKeyRemoved)
+	err := event.Unmarshal(applicationKeyRemoved)
 	if err != nil {
-		return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal application key removed")
+		return nil, errors.ThrowInternal(err, "USER-cjLeA", "unable to unmarshal application key removed")
 	}
 
 	return applicationKeyRemoved, nil

internal/repository/project/member.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
-
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/member"
 )
 
@@ -39,7 +37,7 @@ func NewProjectMemberAddedEvent(
 	}
 }
 
-func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.MemberAddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -72,7 +70,7 @@ func NewProjectMemberChangedEvent(
 	}
 }
 
-func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.ChangedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -103,7 +101,7 @@ func NewProjectMemberRemovedEvent(
 	}
 }
 
-func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -134,7 +132,7 @@ func NewProjectMemberCascadeRemovedEvent(
 	}
 }
 
-func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := member.CascadeRemovedEventMapper(event)
 	if err != nil {
 		return nil, err

internal/repository/project/oidc_config.go

@@ -2,14 +2,12 @@ package project
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )
 
 const (
@@ -43,11 +41,11 @@ type OIDCConfigAddedEvent struct {
 	SkipNativeAppSuccessPage bool                       `json:"skipNativeAppSuccessPage,omitempty"`
 }
 
-func (e *OIDCConfigAddedEvent) Data() interface{} {
+func (e *OIDCConfigAddedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -185,12 +183,12 @@ func (e *OIDCConfigAddedEvent) Validate(cmd eventstore.Command) bool {
 	return e.SkipNativeAppSuccessPage == c.SkipNativeAppSuccessPage
 }
 
-func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config")
 	}
@@ -219,11 +217,11 @@ type OIDCConfigChangedEvent struct {
 	SkipNativeAppSuccessPage *bool                       `json:"skipNativeAppSuccessPage,omitempty"`
 }
 
-func (e *OIDCConfigChangedEvent) Data() interface{} {
+func (e *OIDCConfigChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -343,12 +341,12 @@ func ChangeSkipNativeAppSuccessPage(skipNativeAppSuccessPage bool) func(event *O
 	}
 }
 
-func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config")
 	}
@@ -363,11 +361,11 @@ type OIDCConfigSecretChangedEvent struct {
 	ClientSecret *crypto.CryptoValue `json:"clientSecret,omitempty"`
 }
 
-func (e *OIDCConfigSecretChangedEvent) Data() interface{} {
+func (e *OIDCConfigSecretChangedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigSecretChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigSecretChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -388,12 +386,12 @@ func NewOIDCConfigSecretChangedEvent(
 	}
 }
 
-func OIDCConfigSecretChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigSecretChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigSecretChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-M893d", "unable to unmarshal oidc config")
 	}
@@ -407,11 +405,11 @@ type OIDCConfigSecretCheckSucceededEvent struct {
 	AppID string `json:"appId"`
 }
 
-func (e *OIDCConfigSecretCheckSucceededEvent) Data() interface{} {
+func (e *OIDCConfigSecretCheckSucceededEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -430,12 +428,12 @@ func NewOIDCConfigSecretCheckSucceededEvent(
 	}
 }
 
-func OIDCConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigSecretCheckSucceededEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-837gV", "unable to unmarshal oidc config")
 	}
@@ -449,11 +447,11 @@ type OIDCConfigSecretCheckFailedEvent struct {
 	AppID string `json:"appId"`
 }
 
-func (e *OIDCConfigSecretCheckFailedEvent) Data() interface{} {
+func (e *OIDCConfigSecretCheckFailedEvent) Payload() interface{} {
 	return e
 }
 
-func (e *OIDCConfigSecretCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *OIDCConfigSecretCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
 
@@ -472,12 +470,12 @@ func NewOIDCConfigSecretCheckFailedEvent(
 	}
 }
 
-func OIDCConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func OIDCConfigSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &OIDCConfigSecretCheckFailedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
 
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "OIDC-987g%", "unable to unmarshal oidc config")
 	}