diff --git a/kontor-gin/internal/cmd/export.go b/kontor-gin/internal/cmd/export.go
index 95800fa..37f7e5d 100644
--- a/kontor-gin/internal/cmd/export.go
+++ b/kontor-gin/internal/cmd/export.go
@@ -67,8 +67,8 @@ var exportCmd = &cobra.Command{
 			Permission         []models.PermissionDTO         `json:"permission"`
 			Assignment         []models.AssignmentDTO         `json:"assignment"`
 			Token              []models.TokenDTO              `json:"token"`
-			MailAccount        []map[string]interface{}       `json:"mail_account"`
-			Mail               []map[string]interface{}       `json:"mail"`
+			MailAccount        []models.MailAccountDTO        `json:"mail_account"`
+			Mail               []models.MailDTO               `json:"mail"`
 		}
 
 		var (
@@ -106,8 +106,8 @@ var exportCmd = &cobra.Command{
 			permissions          []models.PermissionDTO
 			assignments          []models.AssignmentDTO
 			tokens               []models.TokenDTO
-			mailaccounts         []map[string]interface{}
-			mail                 []map[string]interface{}
+			mailaccounts         []models.MailAccountDTO
+			mail                 []models.MailDTO
 		)
 
 		registry := map[string]any{
@@ -179,6 +179,7 @@ var exportCmd = &cobra.Command{
 			MediaArticle:       mediaarticles,
 			MediaVideo:         mediavideos,
 			MediaActor:         mediaactors,
+			MediaActorFile:     mediaactorfiles,
 			MediaFile:          mediafiles,
 			MediaLoFi:          medialofis,
 			Profile:            profiles,
diff --git a/kontor-gin/internal/models/mailaccount.go b/kontor-gin/internal/models/mailaccount.go
index d00381a..8766d26 100644
--- a/kontor-gin/internal/models/mailaccount.go
+++ b/kontor-gin/internal/models/mailaccount.go
@@ -27,7 +27,7 @@ type MailAccountDTO struct {
 	ID        string             `json:"id"                     binding:"required"`
 	CreatedAt helpers.KontorTime `json:"created_date"`
 	UpdatedAt helpers.KontorTime `json:"last_modified_date"`
-	DeletedAt *time.Time         `json:"deleted_date.omitempty"`
+	DeletedAt *time.Time         `json:"deleted_date,omitempty"`
 	Version   int                `json:"version"`
 	Host      string             `json:"host"`
 	Port      int                `json:"port"`
diff --git a/kontor-gin/internal/models/media_actor.go b/kontor-gin/internal/models/media_actor.go
index 403ce3d..2250904 100644
--- a/kontor-gin/internal/models/media_actor.go
+++ b/kontor-gin/internal/models/media_actor.go
@@ -19,10 +19,10 @@ func (media_actor *MediaActor) TableName() string {
 }
 
 type MediaActorDTO struct {
-	ID        string     `json:"id"                  binding:"required"`
+	ID        string     `json:"id"                     binding:"required"`
 	CreatedAt time.Time  `json:"created_date"`
 	UpdatedAt time.Time  `json:"last_modified_date"`
-	DeletedAt *time.Time `json:"deleted_date"`
+	DeletedAt *time.Time `json:"deleted_date,omitempty"`
 	Version   int        `json:"version"`
 	Name      string     `json:"name"`
 	WebLink   string     `json:"url"`