diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs
index 12a302e2f6..4dd2a97048 100644
--- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs
+++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs
@@ -3,6 +3,7 @@ use sqlx;
 use sqlx::MySqlPool;
 
 use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
 use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
 use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
@@ -66,7 +67,6 @@ pub async fn insert_media_file_from_face_animation(
   const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference;
   const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::FaceAnimator;
   const ORIGIN_MODEL_TYPE : MediaFileOriginModelType = MediaFileOriginModelType::SadTalker;
-  const MEDIA_TYPE : MediaFileType = MediaFileType::Video;
 
   let record_id = {
     let query_result = sqlx::query!(
@@ -75,11 +75,13 @@ INSERT INTO media_files
 SET
   token = ?,
 
+  media_class = ?,
+  media_type = ?,
+
   origin_category = ?,
   origin_product_category = ?,
   maybe_origin_model_type = ?,
 
-  media_type = ?,
   maybe_mime_type = ?,
   file_size_bytes = ?,
 
@@ -105,11 +107,13 @@ SET
         "#,
       result_token.as_str(),
 
+      MediaFileClass::Video.to_str(),
+      MediaFileType::Video.to_str(),
+
       ORIGIN_CATEGORY.to_str(),
       ORIGIN_PRODUCT_CATEGORY.to_str(),
       ORIGIN_MODEL_TYPE.to_str(),
 
-      MEDIA_TYPE.to_str(),
       args.maybe_mime_type,
       args.file_size_bytes,
 
diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_generic.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_generic.rs
index de1d15ce70..19c80109b7 100644
--- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_generic.rs
+++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_generic.rs
@@ -3,6 +3,7 @@ use sqlx;
 use sqlx::MySqlPool;
 
 use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
 use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
 use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
@@ -22,6 +23,7 @@ pub struct InsertArgs<'a> {
     pub pool: &'a MySqlPool,
     pub job: &'a AvailableInferenceJob,
 
+    pub media_class: MediaFileClass,
     pub media_type: MediaFileType,
 
     // Origin and categorization
@@ -99,6 +101,8 @@ pub async fn insert_media_file_generic(
         INSERT INTO media_files
         SET
             token = ?,
+
+            media_class = ?,
             media_type = ?,
 
             origin_category = ?, 
@@ -140,6 +144,8 @@ pub async fn insert_media_file_generic(
             generated_by_cluster = ?
         "#,
         result_token,
+
+        args.media_class.to_str(),
         args.media_type.to_str(),
 
         args.origin_category.to_str(),
diff --git a/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs b/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs
index 247072641a..b40ea1fb19 100644
--- a/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs
+++ b/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs
@@ -8,6 +8,7 @@ use log::{error, info, warn};
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
 use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
 use enums::by_table::media_files::media_file_type::MediaFileType;
@@ -186,6 +187,7 @@ pub async fn process_job(args: FbxToGltfJobArgs<'_>) -> Result<JobSuccessResult,
   let (inference_result_token, id) = insert_media_file_generic(InsertArgs {
     pool: &args.job_dependencies.db.mysql_pool,
     job: &job,
+    media_class: MediaFileClass::Dimensional,
     media_type: upload_details.media_type,
     origin_category: MediaFileOriginCategory::Processed,
     origin_product_category: MediaFileOriginProductCategory::Mocap,
diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs
index 6b4df42849..1c17399933 100644
--- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs
+++ b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs
@@ -10,6 +10,7 @@ use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFi
 use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
 use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
 use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
@@ -263,7 +264,8 @@ pub async fn process_job_inference(
     let (media_file_token, _id) = insert_media_file_generic(InsertArgs {
       pool: mysql_pool,
       job,
-      media_type: MediaFileType::Image,
+      media_class: MediaFileClass::Image,
+      media_type: MediaFileType::Image, // TODO(bt,2024-04-30): This should be a specific type of image
       origin_category: MediaFileOriginCategory::Upload,
       origin_product_category: MediaFileOriginProductCategory::ImageGeneration,
       maybe_origin_model_type: Some(MediaFileOriginModelType::StableDiffusion15),
diff --git a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs
index 06b4bb403c..ae8870bf55 100644
--- a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs
+++ b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs
@@ -7,6 +7,7 @@ use log::{error, info, warn};
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
 use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
 use enums::by_table::media_files::media_file_type::MediaFileType;
@@ -255,6 +256,7 @@ pub async fn process_job(args: BvhToWorkflowJobArgs<'_>) -> Result<JobSuccessRes
   let (inference_result_token, id) = insert_media_file_generic(InsertArgs {
     pool: &args.job_dependencies.db.mysql_pool,
     job: &job,
+    media_class: MediaFileClass::Video,
     media_type: MediaFileType::Video,
     origin_category: MediaFileOriginCategory::Processed,
     origin_product_category: MediaFileOriginProductCategory::Mocap,