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.
2025-08-11 19:17:32 +00:00 · 2023-10-19 12:19:10 +02:00
parent 259faba3f0
commit b5564572bc
791 changed files with 30326 additions and 43202 deletions
--- a/internal/repository/instance/custom_text.go
+++ b/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
--- a/internal/repository/instance/debug_notification_file.go
+++ b/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
--- a/internal/repository/instance/debug_notification_log.go
+++ b/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
--- a/internal/repository/instance/domain.go
+++ b/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")
 	}
--- a/internal/repository/instance/event_default_language.go
+++ b/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")
 	}
--- a/internal/repository/instance/event_iam_project_set.go
+++ b/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")
 	}
--- a/internal/repository/instance/event_org_set.go
+++ b/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")
 	}
--- a/internal/repository/instance/idp.go
+++ b/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
--- a/internal/repository/instance/idp_config.go
+++ b/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
--- a/internal/repository/instance/idp_jwt_config.go
+++ b/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
--- a/internal/repository/instance/idp_oidc_config.go
+++ b/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
--- a/internal/repository/instance/instance.go
+++ b/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
--- a/internal/repository/instance/member.go
+++ b/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
--- a/internal/repository/instance/oidc_settings.go
+++ b/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")
 	}
--- a/internal/repository/instance/policy_domain.go
+++ b/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
--- a/internal/repository/instance/policy_label.go
+++ b/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
--- a/internal/repository/instance/policy_login.go
+++ b/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
--- a/internal/repository/instance/policy_login_factors.go
+++ b/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
--- a/internal/repository/instance/policy_login_identity_provider.go
+++ b/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
--- a/internal/repository/instance/policy_mail_template.go
+++ b/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
--- a/internal/repository/instance/policy_mail_text.go
+++ b/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
--- a/internal/repository/instance/policy_notification.go
+++ b/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
--- a/internal/repository/instance/policy_password_age.go
+++ b/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
--- a/internal/repository/instance/policy_password_complexity.go
+++ b/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
--- a/internal/repository/instance/policy_password_lockout.go
+++ b/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
--- a/internal/repository/instance/policy_privacy.go
+++ b/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
--- a/internal/repository/instance/policy_security.go
+++ b/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")
 	}
--- a/internal/repository/instance/secret_generator.go
+++ b/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")
 	}
--- a/internal/repository/instance/sms.go
+++ b/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")
 	}
--- a/internal/repository/instance/smtp_config.go
+++ b/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")
 	}