diff --git a/apiserver/database/model/model.py b/apiserver/database/model/model.py
index 84e7ef5..2cbba34 100644
--- a/apiserver/database/model/model.py
+++ b/apiserver/database/model/model.py
@@ -1,7 +1,6 @@
 from typing import Sequence
 
 from mongoengine import (
-    Document,
     StringField,
     DateTimeField,
     BooleanField,
@@ -14,17 +13,15 @@ from apiserver.database.fields import (
     SafeDictField,
     SafeSortedListField,
 )
-from apiserver.database.model import DbModelMixin
+from apiserver.database.model import AttributedDocument
 from apiserver.database.model.base import GetMixin
 from apiserver.database.model.metadata import MetadataItem
 from apiserver.database.model.model_labels import ModelLabels
-from apiserver.database.model.company import Company
 from apiserver.database.model.project import Project
 from apiserver.database.model.task.task import Task
-from apiserver.database.model.user import User
 
 
-class Model(DbModelMixin, Document):
+class Model(AttributedDocument):
     meta = {
         "db_alias": Database.backend,
         "strict": strict,
@@ -73,8 +70,6 @@ class Model(DbModelMixin, Document):
     id = StringField(primary_key=True)
     name = StrippedStringField(user_set_allowed=True, min_length=3)
     parent = StringField(reference_field="Model", required=False)
-    user = StringField(required=True, reference_field=User)
-    company = StringField(required=True, reference_field=Company)
     project = StringField(reference_field=Project, user_set_allowed=True)
     created = DateTimeField(required=True, user_set_allowed=True)
     task = StringField(reference_field=Task)
diff --git a/apiserver/schema/services/events.conf b/apiserver/schema/services/events.conf
index 6a6bcc3..d58d700 100644
--- a/apiserver/schema/services/events.conf
+++ b/apiserver/schema/services/events.conf
@@ -261,7 +261,48 @@
                 }
             }
         }
-        debug_image_sample_reposnse {
+        debug_images_response {
+            type: object
+            properties {
+                scroll_id {
+                    type: string
+                    description: "Scroll ID for getting more results"
+                }
+                metrics {
+                    type: array
+                    description: "Debug image events grouped by tasks and iterations"
+                    items {
+                        type: object
+                        properties {
+                            task {
+                                type: string
+                                description: Task ID
+                            }
+                            iterations {
+                                type: array
+                                items {
+                                    type: object
+                                    properties {
+                                        iter {
+                                            type: integer
+                                            description: Iteration number
+                                        }
+                                        events {
+                                            type: array
+                                            items {
+                                                type: object
+                                                description: Debug image event
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        debug_image_sample_response {
             type: object
             properties {
                 scroll_id {
@@ -431,20 +472,7 @@
                     }
                 }
             }
-            response {
-                type: object
-                properties {
-                    metrics {
-                        type: array
-                        items: { type: object }
-                        description: "Debug image events grouped by task metrics and iterations"
-                    }
-                    scroll_id {
-                        type: string
-                        description: "Scroll ID for getting more results"
-                    }
-                }
-            }
+            response {"$ref": "#/definitions/debug_images_response"}
         }
         "2.14": ${debug_images."2.7"} {
             request {
@@ -491,7 +519,7 @@
                     }
                 }
             }
-            response {"$ref": "#/definitions/debug_image_sample_reposnse"}
+            response {"$ref": "#/definitions/debug_image_sample_response"}
         }
     }
     next_debug_image_sample {
@@ -516,7 +544,7 @@
                     }
                 }
             }
-            response {"$ref": "#/definitions/debug_image_sample_reposnse"}
+            response {"$ref": "#/definitions/debug_image_sample_response"}
         }
     }
     get_task_metrics{