From 1ed2630b6ba4828763f418f5ca584a98dc66bab4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 15:46:50 +0000
Subject: [PATCH] feat: APIs update from
 https://github.com/anduril/apis/commit/dbee5118f1ee13f44c7c084226c3bd8037907f40

---
 .../v1/entities_openapi_model.gen.yaml        |  25 +
 .../anduril/entitymanager/v1/entity.pub.proto |   7 +-
 .../anduril/entitymanager/v1/media.pub.proto  |  12 +-
 .../anduril/entitymanager/v1/signal.pub.proto |  13 +-
 .../v1/tasks_openapi_model.gen.yaml           |  25 +
 src/anduril/entitymanager/v1/entity.pub.pb.cc | 671 ++++++++++--------
 src/anduril/entitymanager/v1/entity.pub.pb.h  | 277 +++++---
 src/anduril/entitymanager/v1/media.pub.pb.cc  |  82 +--
 src/anduril/entitymanager/v1/media.pub.pb.h   |  78 +-
 src/anduril/entitymanager/v1/signal.pub.pb.cc | 203 +++---
 src/anduril/entitymanager/v1/signal.pub.pb.h  |  25 +-
 11 files changed, 768 insertions(+), 650 deletions(-)

diff --git a/protos/anduril/entitymanager/v1/entities_openapi_model.gen.yaml b/protos/anduril/entitymanager/v1/entities_openapi_model.gen.yaml
index 905dd6c..1763e6f 100644
--- a/protos/anduril/entitymanager/v1/entities_openapi_model.gen.yaml
+++ b/protos/anduril/entitymanager/v1/entities_openapi_model.gen.yaml
@@ -649,6 +649,10 @@ components:
                     allOf:
                         - $ref: '#/components/schemas/TaskCatalog'
                     description: A catalog of tasks that can be performed by an entity.
+                media:
+                    allOf:
+                        - $ref: '#/components/schemas/Media'
+                    description: Media associated with an entity, such as videos, images, or thumbnails.
                 relationships:
                     allOf:
                         - $ref: '#/components/schemas/Relationships'
@@ -1270,6 +1274,27 @@ components:
                     description: Estimated one standard deviation in same unit as the value.
                     format: double
             description: A component that describes some measured value with error.
+        Media:
+            type: object
+            properties:
+                media:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/MediaItem'
+            description: Media associated with an entity.
+        MediaItem:
+            type: object
+            properties:
+                type:
+                    enum:
+                        - MEDIA_TYPE_INVALID
+                        - MEDIA_TYPE_IMAGE
+                        - MEDIA_TYPE_VIDEO
+                    type: string
+                    format: enum
+                relativePath:
+                    type: string
+                    description: The path, relative to the environment base URL, where media related to an entity can be accessed
         MergedFrom:
             type: object
             properties: {}
diff --git a/protos/anduril/entitymanager/v1/entity.pub.proto b/protos/anduril/entitymanager/v1/entity.pub.proto
index 27f13f3..b94067b 100644
--- a/protos/anduril/entitymanager/v1/entity.pub.proto
+++ b/protos/anduril/entitymanager/v1/entity.pub.proto
@@ -8,6 +8,7 @@ import "anduril/entitymanager/v1/geoentity.pub.proto";
 import "anduril/entitymanager/v1/group.pub.proto";
 import "anduril/entitymanager/v1/health_status.pub.proto";
 import "anduril/entitymanager/v1/location.pub.proto";
+import "anduril/entitymanager/v1/media.pub.proto";
 import "anduril/entitymanager/v1/ontology.pub.proto";
 import "anduril/entitymanager/v1/options.pub.proto";
 import "anduril/entitymanager/v1/orbit.pub.proto";
@@ -103,6 +104,8 @@ message Entity {
   Classification data_classification = 29;
   // A catalog of tasks that can be performed by an entity.
   anduril.tasks.v2.TaskCatalog task_catalog = 31 [(anduril.entitymanager.v1.overridable) = true];
+  // Media associated with an entity, such as videos, images, or thumbnails.
+  Media media = 32;
   // The relationships between this entity and other entities in the common operational picture (COP).
   Relationships relationships = 33;
   // Visual details associated with the display of an entity in the client.
@@ -122,8 +125,8 @@ message Entity {
   // Orbit information for space objects.
   Orbit orbit = 46;
 
-  reserved 9, 16, 17, 18, 27, 28, 32, 41, 43;
-  reserved "correlated", "original_data", "geopolygon", "media", "contact", "team_status", "no_expiry";
+  reserved 9, 16, 17, 18, 27, 28, 41, 43;
+  reserved "correlated", "original_data", "geopolygon", "contact", "team_status", "no_expiry";
 }
 
 // Contains status of entities.
diff --git a/protos/anduril/entitymanager/v1/media.pub.proto b/protos/anduril/entitymanager/v1/media.pub.proto
index 0ab6548..5a6abd0 100644
--- a/protos/anduril/entitymanager/v1/media.pub.proto
+++ b/protos/anduril/entitymanager/v1/media.pub.proto
@@ -16,19 +16,17 @@ message Media {
 }
 
 message MediaItem {
-  // To Be Deprecated, use relative_path.
-  // The url where the media related to an entity can be accessed
-  string url = 1;
   MediaType type = 2;
-  // The relative path where the media related to an entity can be accessed when used to query against a blobs service
-  // node.
+  // The path, relative to the environment base URL, where media related to an entity can be accessed
   string relative_path = 3;
+
+  reserved 1;
 }
 
 enum MediaType {
   MEDIA_TYPE_INVALID = 0;
-  MEDIA_TYPE_THUMBNAIL = 1;
   MEDIA_TYPE_IMAGE = 2;
   MEDIA_TYPE_VIDEO = 3;
-  MEDIA_TYPE_SLIPPY_TILES = 4;
+
+  reserved 1, 4;
 }
diff --git a/protos/anduril/entitymanager/v1/signal.pub.proto b/protos/anduril/entitymanager/v1/signal.pub.proto
index 8f767f5..ba59898 100644
--- a/protos/anduril/entitymanager/v1/signal.pub.proto
+++ b/protos/anduril/entitymanager/v1/signal.pub.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package anduril.entitymanager.v1;
 
+import "anduril/entitymanager/v1/options.pub.proto";
 import "anduril/type/coords.pub.proto";
 import "google/protobuf/wrappers.proto";
 
@@ -15,11 +16,11 @@ option objc_class_prefix = "AEX";
 message Signal {
   // Indicates either a frequency range or a center frequency of this signal.
   oneof frequency_measurement {
-    Frequency frequency_center = 1;
-    FrequencyRange frequency_range = 2;
+    Frequency frequency_center = 1 [(anduril.entitymanager.v1.overridable) = true];
+    FrequencyRange frequency_range = 2 [(anduril.entitymanager.v1.overridable) = true];
   }
   // Indicates the bandwidth of a signal (Hz).
-  google.protobuf.DoubleValue bandwidth_hz = 3;
+  google.protobuf.DoubleValue bandwidth_hz = 3 [(anduril.entitymanager.v1.overridable) = true];
   // Indicates the signal to noise (SNR) of this signal.
   google.protobuf.DoubleValue signal_to_noise_ratio = 4;
   // Indicates the signal report.
@@ -28,11 +29,11 @@ message Signal {
     Fixed fixed = 6;
   }
   // Emitter notations associated with this entity.
-  repeated EmitterNotation emitter_notations = 7;
+  repeated EmitterNotation emitter_notations = 7 [(anduril.entitymanager.v1.overridable) = true];
   // length in time of a single pulse
-  google.protobuf.DoubleValue pulse_width_s = 8;
+  google.protobuf.DoubleValue pulse_width_s = 8 [(anduril.entitymanager.v1.overridable) = true];
   // length in time between the start of two pulses
-  PulseRepetitionInterval pulse_repetition_interval = 9;
+  PulseRepetitionInterval pulse_repetition_interval = 9 [(anduril.entitymanager.v1.overridable) = true];
   // describes how a signal is observing the environment
   ScanCharacteristics scan_characteristics = 11;
 
diff --git a/protos/anduril/taskmanager/v1/tasks_openapi_model.gen.yaml b/protos/anduril/taskmanager/v1/tasks_openapi_model.gen.yaml
index f7665d1..7ba07de 100644
--- a/protos/anduril/taskmanager/v1/tasks_openapi_model.gen.yaml
+++ b/protos/anduril/taskmanager/v1/tasks_openapi_model.gen.yaml
@@ -685,6 +685,10 @@ components:
                     allOf:
                         - $ref: '#/components/schemas/TaskCatalog'
                     description: A catalog of tasks that can be performed by an entity.
+                media:
+                    allOf:
+                        - $ref: '#/components/schemas/Media'
+                    description: Media associated with an entity, such as videos, images, or thumbnails.
                 relationships:
                     allOf:
                         - $ref: '#/components/schemas/Relationships'
@@ -1288,6 +1292,27 @@ components:
                     description: Estimated one standard deviation in same unit as the value.
                     format: double
             description: A component that describes some measured value with error.
+        Media:
+            type: object
+            properties:
+                media:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/MediaItem'
+            description: Media associated with an entity.
+        MediaItem:
+            type: object
+            properties:
+                type:
+                    enum:
+                        - MEDIA_TYPE_INVALID
+                        - MEDIA_TYPE_IMAGE
+                        - MEDIA_TYPE_VIDEO
+                    type: string
+                    format: enum
+                relativePath:
+                    type: string
+                    description: The path, relative to the environment base URL, where media related to an entity can be accessed
         MergedFrom:
             type: object
             properties: {}
diff --git a/src/anduril/entitymanager/v1/entity.pub.pb.cc b/src/anduril/entitymanager/v1/entity.pub.pb.cc
index 16b64ad..db7c633 100644
--- a/src/anduril/entitymanager/v1/entity.pub.pb.cc
+++ b/src/anduril/entitymanager/v1/entity.pub.pb.cc
@@ -548,6 +548,7 @@ inline constexpr Entity::Impl_::Impl_(
         data_classification_{nullptr},
         power_state_{nullptr},
         task_catalog_{nullptr},
+        media_{nullptr},
         relationships_{nullptr},
         visual_details_{nullptr},
         dimensions_{nullptr},
@@ -682,6 +683,7 @@ const ::uint32_t
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.transponder_codes_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.data_classification_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.task_catalog_),
+        PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.media_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.relationships_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.visual_details_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Entity, _impl_.dimensions_),
@@ -703,7 +705,7 @@ const ::uint32_t
         16,
         3,
         4,
-        31,
+        32,
         5,
         6,
         12,
@@ -726,6 +728,7 @@ const ::uint32_t
         28,
         29,
         30,
+        31,
         ~0u,  // no _has_bits_
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::Status, _internal_metadata_),
         ~0u,  // no _extensions_
@@ -994,27 +997,27 @@ const ::uint32_t
 
 static const ::_pbi::MigrationSchema
     schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 43, -1, sizeof(::anduril::entitymanager::v1::Entity)},
-        {78, -1, -1, sizeof(::anduril::entitymanager::v1::Status)},
-        {88, -1, -1, sizeof(::anduril::entitymanager::v1::Aliases)},
-        {98, 112, -1, sizeof(::anduril::entitymanager::v1::Tracked)},
-        {118, 131, -1, sizeof(::anduril::entitymanager::v1::Provenance)},
-        {136, 150, -1, sizeof(::anduril::entitymanager::v1::Indicators)},
-        {156, -1, -1, sizeof(::anduril::entitymanager::v1::Overrides)},
-        {165, 180, -1, sizeof(::anduril::entitymanager::v1::Override)},
-        {187, -1, -1, sizeof(::anduril::entitymanager::v1::AlternateId)},
-        {197, 206, -1, sizeof(::anduril::entitymanager::v1::VisualDetails)},
-        {207, 219, -1, sizeof(::anduril::entitymanager::v1::RangeRings)},
-        {223, 236, -1, sizeof(::anduril::entitymanager::v1::Correlation)},
-        {240, -1, -1, sizeof(::anduril::entitymanager::v1::PrimaryCorrelation)},
-        {249, 259, -1, sizeof(::anduril::entitymanager::v1::SecondaryCorrelation)},
-        {261, 274, -1, sizeof(::anduril::entitymanager::v1::CorrelationMembership)},
-        {278, -1, -1, sizeof(::anduril::entitymanager::v1::PrimaryMembership)},
-        {286, -1, -1, sizeof(::anduril::entitymanager::v1::NonPrimaryMembership)},
-        {294, 304, -1, sizeof(::anduril::entitymanager::v1::Decorrelation)},
-        {306, 315, -1, sizeof(::anduril::entitymanager::v1::DecorrelatedAll)},
-        {316, 326, -1, sizeof(::anduril::entitymanager::v1::DecorrelatedSingle)},
-        {328, 339, -1, sizeof(::anduril::entitymanager::v1::CorrelationMetadata)},
+        {0, 44, -1, sizeof(::anduril::entitymanager::v1::Entity)},
+        {80, -1, -1, sizeof(::anduril::entitymanager::v1::Status)},
+        {90, -1, -1, sizeof(::anduril::entitymanager::v1::Aliases)},
+        {100, 114, -1, sizeof(::anduril::entitymanager::v1::Tracked)},
+        {120, 133, -1, sizeof(::anduril::entitymanager::v1::Provenance)},
+        {138, 152, -1, sizeof(::anduril::entitymanager::v1::Indicators)},
+        {158, -1, -1, sizeof(::anduril::entitymanager::v1::Overrides)},
+        {167, 182, -1, sizeof(::anduril::entitymanager::v1::Override)},
+        {189, -1, -1, sizeof(::anduril::entitymanager::v1::AlternateId)},
+        {199, 208, -1, sizeof(::anduril::entitymanager::v1::VisualDetails)},
+        {209, 221, -1, sizeof(::anduril::entitymanager::v1::RangeRings)},
+        {225, 238, -1, sizeof(::anduril::entitymanager::v1::Correlation)},
+        {242, -1, -1, sizeof(::anduril::entitymanager::v1::PrimaryCorrelation)},
+        {251, 261, -1, sizeof(::anduril::entitymanager::v1::SecondaryCorrelation)},
+        {263, 276, -1, sizeof(::anduril::entitymanager::v1::CorrelationMembership)},
+        {280, -1, -1, sizeof(::anduril::entitymanager::v1::PrimaryMembership)},
+        {288, -1, -1, sizeof(::anduril::entitymanager::v1::NonPrimaryMembership)},
+        {296, 306, -1, sizeof(::anduril::entitymanager::v1::Decorrelation)},
+        {308, 317, -1, sizeof(::anduril::entitymanager::v1::DecorrelatedAll)},
+        {318, 328, -1, sizeof(::anduril::entitymanager::v1::DecorrelatedSingle)},
+        {330, 341, -1, sizeof(::anduril::entitymanager::v1::CorrelationMetadata)},
 };
 static const ::_pb::Message* const file_default_instances[] = {
     &::anduril::entitymanager::v1::_Entity_default_instance_._instance,
@@ -1049,200 +1052,203 @@ const char descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fentity_2epub
     "ity.pub.proto\032(anduril/entitymanager/v1/"
     "group.pub.proto\0320anduril/entitymanager/v"
     "1/health_status.pub.proto\032+anduril/entit"
-    "ymanager/v1/location.pub.proto\032+anduril/"
-    "entitymanager/v1/ontology.pub.proto\032*and"
-    "uril/entitymanager/v1/options.pub.proto\032"
-    "(anduril/entitymanager/v1/orbit.pub.prot"
-    "o\032+anduril/entitymanager/v1/payloads.pub"
-    ".proto\032(anduril/entitymanager/v1/power.p"
-    "ub.proto\032/anduril/entitymanager/v1/relat"
-    "ionship.pub.proto\0320anduril/entitymanager"
-    "/v1/route_details.pub.proto\032+anduril/ent"
-    "itymanager/v1/schedule.pub.proto\032*anduri"
-    "l/entitymanager/v1/sensors.pub.proto\032)an"
-    "duril/entitymanager/v1/signal.pub.proto\032"
-    "+anduril/entitymanager/v1/supplies.pub.p"
-    "roto\0322anduril/entitymanager/v1/target_pr"
-    "iority.pub.proto\0324anduril/entitymanager/"
-    "v1/transponder_codes.pub.proto\032(anduril/"
-    "entitymanager/v1/types.pub.proto\032\"anduri"
-    "l/tasks/v2/catalog.pub.proto\032\034anduril/ty"
-    "pe/color.pub.proto\032\037google/protobuf/time"
-    "stamp.proto\032\036google/protobuf/wrappers.pr"
-    "oto\"\231\023\n\006Entity\022\033\n\tentity_id\030\001 \001(\tR\010entit"
-    "yId\022 \n\013description\030\002 \001(\tR\013description\022\027\n"
-    "\007is_live\030\003 \001(\010R\006isLive\022=\n\014created_time\030\004"
-    " \001(\0132\032.google.protobuf.TimestampR\013create"
-    "dTime\022@\n\013expiry_time\030\005 \001(\0132\032.google.prot"
-    "obuf.TimestampB\003\310>\001R\nexpiryTime\0228\n\006statu"
-    "s\030\023 \001(\0132 .anduril.entitymanager.v1.Statu"
-    "sR\006status\022>\n\010location\030\006 \001(\0132\".anduril.en"
-    "titymanager.v1.LocationR\010location\022`\n\024loc"
-    "ation_uncertainty\030\017 \001(\0132-.anduril.entity"
-    "manager.v1.LocationUncertaintyR\023location"
-    "Uncertainty\022\?\n\tgeo_shape\030\027 \001(\0132\".anduril"
-    ".entitymanager.v1.GeoShapeR\010geoShape\022E\n\013"
-    "geo_details\030\030 \001(\0132$.anduril.entitymanage"
-    "r.v1.GeoDetailsR\ngeoDetails\022;\n\007aliases\030\007"
-    " \001(\0132!.anduril.entitymanager.v1.AliasesR"
-    "\007aliases\022;\n\007tracked\030\010 \001(\0132!.anduril.enti"
-    "tymanager.v1.TrackedR\007tracked\022G\n\013correla"
-    "tion\030/ \001(\0132%.anduril.entitymanager.v1.Co"
-    "rrelationR\013correlation\022<\n\010mil_view\030\n \001(\013"
-    "2!.anduril.entitymanager.v1.MilViewR\007mil"
-    "View\022>\n\010ontology\030\013 \001(\0132\".anduril.entitym"
-    "anager.v1.OntologyR\010ontology\022;\n\007sensors\030"
-    "\024 \001(\0132!.anduril.entitymanager.v1.Sensors"
-    "R\007sensors\022>\n\010payloads\030\025 \001(\0132\".anduril.en"
-    "titymanager.v1.PayloadsR\010payloads\022E\n\013pow"
-    "er_state\030\036 \001(\0132$.anduril.entitymanager.v"
-    "1.PowerStateR\npowerState\022D\n\nprovenance\030\014"
-    " \001(\0132$.anduril.entitymanager.v1.Provenan"
-    "ceR\nprovenance\022A\n\toverrides\030\r \001(\0132#.andu"
-    "ril.entitymanager.v1.OverridesR\toverride"
-    "s\022D\n\nindicators\030\016 \001(\0132$.anduril.entityma"
-    "nager.v1.IndicatorsR\nindicators\022Q\n\017targe"
-    "t_priority\030\026 \001(\0132(.anduril.entitymanager"
-    ".v1.TargetPriorityR\016targetPriority\0228\n\006si"
-    "gnal\030\031 \001(\0132 .anduril.entitymanager.v1.Si"
-    "gnalR\006signal\022W\n\021transponder_codes\030\032 \001(\0132"
-    "*.anduril.entitymanager.v1.TransponderCo"
-    "desR\020transponderCodes\022Y\n\023data_classifica"
-    "tion\030\035 \001(\0132(.anduril.entitymanager.v1.Cl"
-    "assificationR\022dataClassification\022E\n\014task"
-    "_catalog\030\037 \001(\0132\035.anduril.tasks.v2.TaskCa"
-    "talogB\003\310>\001R\013taskCatalog\022M\n\rrelationships"
-    "\030! \001(\0132\'.anduril.entitymanager.v1.Relati"
-    "onshipsR\rrelationships\022N\n\016visual_details"
-    "\030\" \001(\0132\'.anduril.entitymanager.v1.Visual"
-    "DetailsR\rvisualDetails\022D\n\ndimensions\030$ \001"
-    "(\0132$.anduril.entitymanager.v1.Dimensions"
-    "R\ndimensions\022K\n\rroute_details\030% \001(\0132&.an"
-    "duril.entitymanager.v1.RouteDetailsR\014rou"
-    "teDetails\022A\n\tschedules\030& \001(\0132#.anduril.e"
-    "ntitymanager.v1.SchedulesR\tschedules\0228\n\006"
-    "health\030\' \001(\0132 .anduril.entitymanager.v1."
-    "HealthR\006health\022K\n\rgroup_details\030( \001(\0132&."
-    "anduril.entitymanager.v1.GroupDetailsR\014g"
-    "roupDetails\022>\n\010supplies\030* \001(\0132\".anduril."
-    "entitymanager.v1.SuppliesR\010supplies\0225\n\005o"
-    "rbit\030. \001(\0132\037.anduril.entitymanager.v1.Or"
-    "bitR\005orbitJ\004\010\t\020\nJ\004\010\020\020\021J\004\010\021\020\022J\004\010\022\020\023J\004\010\033\020\034"
-    "J\004\010\034\020\035J\004\010 \020!J\004\010)\020*J\004\010+\020,R\ncorrelatedR\ror"
-    "iginal_dataR\ngeopolygonR\005mediaR\007contactR"
-    "\013team_statusR\tno_expiry\"I\n\006Status\022+\n\021pla"
-    "tform_activity\030\001 \001(\tR\020platformActivity\022\022"
-    "\n\004role\030\002 \001(\tR\004role\"s\n\007Aliases\022O\n\ralterna"
-    "te_ids\030\001 \003(\0132%.anduril.entitymanager.v1."
-    "AlternateIdB\003\310>\001R\014alternateIds\022\027\n\004name\030\002"
-    " \001(\tB\003\310>\001R\004name\"\236\004\n\007Tracked\022O\n\025track_qua"
-    "lity_wrapper\030\002 \001(\0132\033.google.protobuf.Int"
-    "32ValueR\023trackQualityWrapper\022<\n\013sensor_h"
-    "its\030\003 \001(\0132\033.google.protobuf.Int32ValueR\n"
-    "sensorHits\022Q\n\021number_of_objects\030\004 \001(\0132%."
-    "anduril.entitymanager.v1.UInt32RangeR\017nu"
-    "mberOfObjects\022L\n\023radar_cross_section\030\006 \001"
-    "(\0132\034.google.protobuf.DoubleValueR\021radarC"
-    "rossSection\022N\n\025last_measurement_time\030\007 \001"
-    "(\0132\032.google.protobuf.TimestampR\023lastMeas"
-    "urementTime\022O\n\017line_of_bearing\030\t \001(\0132\'.a"
-    "nduril.entitymanager.v1.LineOfBearingR\rl"
-    "ineOfBearingJ\004\010\001\020\002J\004\010\005\020\006J\004\010\010\020\tR\rtrack_qu"
-    "alityR\016sensor_detailsR\021relative_position"
-    "\"\360\001\n\nProvenance\022)\n\020integration_name\030\005 \001("
-    "\tR\017integrationName\022\033\n\tdata_type\030\006 \001(\tR\010d"
-    "ataType\022\033\n\tsource_id\030\003 \001(\tR\010sourceId\022H\n\022"
-    "source_update_time\030\002 \001(\0132\032.google.protob"
-    "uf.TimestampR\020sourceUpdateTime\022-\n\022source"
-    "_description\030\004 \001(\tR\021sourceDescriptionJ\004\010"
-    "\001\020\002\"\361\002\n\nIndicators\0228\n\tsimulated\030\001 \001(\0132\032."
-    "google.protobuf.BoolValueR\tsimulated\0226\n\010"
-    "exercise\030\002 \001(\0132\032.google.protobuf.BoolVal"
-    "ueR\010exercise\0228\n\temergency\030\003 \001(\0132\032.google"
-    ".protobuf.BoolValueR\temergency\022*\n\002c2\030\004 \001"
-    "(\0132\032.google.protobuf.BoolValueR\002c2\022\?\n\neg"
-    "ressable\030\006 \001(\0132\032.google.protobuf.BoolVal"
-    "ueB\003\310>\001R\negressable\0229\n\007starred\030\007 \001(\0132\032.g"
-    "oogle.protobuf.BoolValueB\003\310>\001R\007starredJ\004"
-    "\010\005\020\006R\tdeletable\"]\n\tOverrides\022>\n\010override"
-    "\030\002 \003(\0132\".anduril.entitymanager.v1.Overri"
-    "deR\010overrideJ\004\010\001\020\002R\nprovenance\"\245\003\n\010Overr"
-    "ide\022\035\n\nrequest_id\030\001 \001(\tR\trequestId\022\035\n\nfi"
-    "eld_path\030\002 \001(\tR\tfieldPath\022N\n\022masked_fiel"
-    "d_value\030\003 \001(\0132 .anduril.entitymanager.v1"
-    ".EntityR\020maskedFieldValue\022@\n\006status\030\004 \001("
-    "\0162(.anduril.entitymanager.v1.OverrideSta"
-    "tusR\006status\022D\n\nprovenance\030\005 \001(\0132$.anduri"
-    "l.entitymanager.v1.ProvenanceR\nprovenanc"
-    "e\022:\n\004type\030\006 \001(\0162&.anduril.entitymanager."
-    "v1.OverrideTypeR\004type\022G\n\021request_timesta"
-    "mp\030\007 \001(\0132\032.google.protobuf.TimestampR\020re"
-    "questTimestamp\"d\n\013AlternateId\022\016\n\002id\030\002 \001("
-    "\tR\002id\0227\n\004type\030\003 \001(\0162#.anduril.entitymana"
-    "ger.v1.AltIdTypeR\004typeJ\004\010\001\020\002R\006source\"[\n\r"
-    "VisualDetails\022J\n\013range_rings\030\001 \001(\0132$.and"
-    "uril.entitymanager.v1.RangeRingsB\003\310>\001R\nr"
-    "angeRings\"\360\001\n\nRangeRings\022B\n\016min_distance"
-    "_m\030\001 \001(\0132\034.google.protobuf.DoubleValueR\014"
-    "minDistanceM\022B\n\016max_distance_m\030\002 \001(\0132\034.g"
-    "oogle.protobuf.DoubleValueR\014maxDistanceM"
-    "\022\035\n\nring_count\030\003 \001(\rR\tringCount\022;\n\017ring_"
-    "line_color\030\004 \001(\0132\023.anduril.type.ColorR\rr"
-    "ingLineColor\"\326\002\n\013Correlation\022H\n\007primary\030"
-    "\001 \001(\0132,.anduril.entitymanager.v1.Primary"
-    "CorrelationH\000R\007primary\022N\n\tsecondary\030\002 \001("
-    "\0132..anduril.entitymanager.v1.SecondaryCo"
-    "rrelationH\000R\tsecondary\022O\n\nmembership\030\004 \001"
-    "(\0132/.anduril.entitymanager.v1.Correlatio"
-    "nMembershipR\nmembership\022M\n\rdecorrelation"
-    "\030\003 \001(\0132\'.anduril.entitymanager.v1.Decorr"
-    "elationR\rdecorrelationB\r\n\013correlation\"F\n"
-    "\022PrimaryCorrelation\0220\n\024secondary_entity_"
-    "ids\030\001 \003(\tR\022secondaryEntityIds\"\215\001\n\024Second"
-    "aryCorrelation\022*\n\021primary_entity_id\030\001 \001("
-    "\tR\017primaryEntityId\022I\n\010metadata\030\002 \001(\0132-.a"
-    "nduril.entitymanager.v1.CorrelationMetad"
-    "ataR\010metadata\"\272\002\n\025CorrelationMembership\022"
-    ",\n\022correlation_set_id\030\001 \001(\tR\020correlation"
-    "SetId\022G\n\007primary\030\002 \001(\0132+.anduril.entitym"
-    "anager.v1.PrimaryMembershipH\000R\007primary\022Q"
-    "\n\013non_primary\030\003 \001(\0132..anduril.entitymana"
-    "ger.v1.NonPrimaryMembershipH\000R\nnonPrimar"
-    "y\022I\n\010metadata\030\004 \001(\0132-.anduril.entitymana"
-    "ger.v1.CorrelationMetadataR\010metadataB\014\n\n"
-    "membership\"\023\n\021PrimaryMembership\"\026\n\024NonPr"
-    "imaryMembership\"\257\001\n\rDecorrelation\022;\n\003all"
-    "\030\001 \001(\0132).anduril.entitymanager.v1.Decorr"
-    "elatedAllR\003all\022a\n\025decorrelated_entities\030"
-    "\002 \003(\0132,.anduril.entitymanager.v1.Decorre"
-    "latedSingleR\024decorrelatedEntities\"\\\n\017Dec"
-    "orrelatedAll\022I\n\010metadata\030\001 \001(\0132-.anduril"
-    ".entitymanager.v1.CorrelationMetadataR\010m"
-    "etadata\"|\n\022DecorrelatedSingle\022\033\n\tentity_"
-    "id\030\001 \001(\tR\010entityId\022I\n\010metadata\030\002 \001(\0132-.a"
-    "nduril.entitymanager.v1.CorrelationMetad"
-    "ataR\010metadata\"\373\001\n\023CorrelationMetadata\022D\n"
-    "\nprovenance\030\001 \001(\0132$.anduril.entitymanage"
-    "r.v1.ProvenanceR\nprovenance\022_\n\020replicati"
-    "on_mode\030\002 \001(\01624.anduril.entitymanager.v1"
-    ".CorrelationReplicationModeR\017replication"
-    "Mode\022=\n\004type\030\003 \001(\0162).anduril.entitymanag"
-    "er.v1.CorrelationTypeR\004type*l\n\017Correlati"
-    "onType\022\034\n\030CORRELATION_TYPE_INVALID\020\000\022\033\n\027"
-    "CORRELATION_TYPE_MANUAL\020\001\022\036\n\032CORRELATION"
-    "_TYPE_AUTOMATED\020\002*\227\001\n\032CorrelationReplica"
-    "tionMode\022(\n$CORRELATION_REPLICATION_MODE"
-    "_INVALID\020\000\022&\n\"CORRELATION_REPLICATION_MO"
-    "DE_LOCAL\020\001\022\'\n#CORRELATION_REPLICATION_MO"
-    "DE_GLOBAL\020\002B\377\001\n\034com.anduril.entitymanage"
-    "r.v1B\016EntityPubProtoP\001ZMghe.anduril.dev/"
-    "anduril/andurilapis-go/anduril/entityman"
-    "ager/v1;entitymanager\242\002\003AEX\252\002\030Anduril.En"
-    "titymanager.V1\312\002\030Anduril\\Entitymanager\\V"
-    "1\342\002$Anduril\\Entitymanager\\V1\\GPBMetadata"
-    "\352\002\032Anduril::Entitymanager::V1b\006proto3"
+    "ymanager/v1/location.pub.proto\032(anduril/"
+    "entitymanager/v1/media.pub.proto\032+anduri"
+    "l/entitymanager/v1/ontology.pub.proto\032*a"
+    "nduril/entitymanager/v1/options.pub.prot"
+    "o\032(anduril/entitymanager/v1/orbit.pub.pr"
+    "oto\032+anduril/entitymanager/v1/payloads.p"
+    "ub.proto\032(anduril/entitymanager/v1/power"
+    ".pub.proto\032/anduril/entitymanager/v1/rel"
+    "ationship.pub.proto\0320anduril/entitymanag"
+    "er/v1/route_details.pub.proto\032+anduril/e"
+    "ntitymanager/v1/schedule.pub.proto\032*andu"
+    "ril/entitymanager/v1/sensors.pub.proto\032)"
+    "anduril/entitymanager/v1/signal.pub.prot"
+    "o\032+anduril/entitymanager/v1/supplies.pub"
+    ".proto\0322anduril/entitymanager/v1/target_"
+    "priority.pub.proto\0324anduril/entitymanage"
+    "r/v1/transponder_codes.pub.proto\032(anduri"
+    "l/entitymanager/v1/types.pub.proto\032\"andu"
+    "ril/tasks/v2/catalog.pub.proto\032\034anduril/"
+    "type/color.pub.proto\032\037google/protobuf/ti"
+    "mestamp.proto\032\036google/protobuf/wrappers."
+    "proto\"\303\023\n\006Entity\022\033\n\tentity_id\030\001 \001(\tR\010ent"
+    "ityId\022 \n\013description\030\002 \001(\tR\013description\022"
+    "\027\n\007is_live\030\003 \001(\010R\006isLive\022=\n\014created_time"
+    "\030\004 \001(\0132\032.google.protobuf.TimestampR\013crea"
+    "tedTime\022@\n\013expiry_time\030\005 \001(\0132\032.google.pr"
+    "otobuf.TimestampB\003\310>\001R\nexpiryTime\0228\n\006sta"
+    "tus\030\023 \001(\0132 .anduril.entitymanager.v1.Sta"
+    "tusR\006status\022>\n\010location\030\006 \001(\0132\".anduril."
+    "entitymanager.v1.LocationR\010location\022`\n\024l"
+    "ocation_uncertainty\030\017 \001(\0132-.anduril.enti"
+    "tymanager.v1.LocationUncertaintyR\023locati"
+    "onUncertainty\022\?\n\tgeo_shape\030\027 \001(\0132\".andur"
+    "il.entitymanager.v1.GeoShapeR\010geoShape\022E"
+    "\n\013geo_details\030\030 \001(\0132$.anduril.entitymana"
+    "ger.v1.GeoDetailsR\ngeoDetails\022;\n\007aliases"
+    "\030\007 \001(\0132!.anduril.entitymanager.v1.Aliase"
+    "sR\007aliases\022;\n\007tracked\030\010 \001(\0132!.anduril.en"
+    "titymanager.v1.TrackedR\007tracked\022G\n\013corre"
+    "lation\030/ \001(\0132%.anduril.entitymanager.v1."
+    "CorrelationR\013correlation\022<\n\010mil_view\030\n \001"
+    "(\0132!.anduril.entitymanager.v1.MilViewR\007m"
+    "ilView\022>\n\010ontology\030\013 \001(\0132\".anduril.entit"
+    "ymanager.v1.OntologyR\010ontology\022;\n\007sensor"
+    "s\030\024 \001(\0132!.anduril.entitymanager.v1.Senso"
+    "rsR\007sensors\022>\n\010payloads\030\025 \001(\0132\".anduril."
+    "entitymanager.v1.PayloadsR\010payloads\022E\n\013p"
+    "ower_state\030\036 \001(\0132$.anduril.entitymanager"
+    ".v1.PowerStateR\npowerState\022D\n\nprovenance"
+    "\030\014 \001(\0132$.anduril.entitymanager.v1.Proven"
+    "anceR\nprovenance\022A\n\toverrides\030\r \001(\0132#.an"
+    "duril.entitymanager.v1.OverridesR\toverri"
+    "des\022D\n\nindicators\030\016 \001(\0132$.anduril.entity"
+    "manager.v1.IndicatorsR\nindicators\022Q\n\017tar"
+    "get_priority\030\026 \001(\0132(.anduril.entitymanag"
+    "er.v1.TargetPriorityR\016targetPriority\0228\n\006"
+    "signal\030\031 \001(\0132 .anduril.entitymanager.v1."
+    "SignalR\006signal\022W\n\021transponder_codes\030\032 \001("
+    "\0132*.anduril.entitymanager.v1.Transponder"
+    "CodesR\020transponderCodes\022Y\n\023data_classifi"
+    "cation\030\035 \001(\0132(.anduril.entitymanager.v1."
+    "ClassificationR\022dataClassification\022E\n\014ta"
+    "sk_catalog\030\037 \001(\0132\035.anduril.tasks.v2.Task"
+    "CatalogB\003\310>\001R\013taskCatalog\0225\n\005media\030  \001(\013"
+    "2\037.anduril.entitymanager.v1.MediaR\005media"
+    "\022M\n\rrelationships\030! \001(\0132\'.anduril.entity"
+    "manager.v1.RelationshipsR\rrelationships\022"
+    "N\n\016visual_details\030\" \001(\0132\'.anduril.entity"
+    "manager.v1.VisualDetailsR\rvisualDetails\022"
+    "D\n\ndimensions\030$ \001(\0132$.anduril.entitymana"
+    "ger.v1.DimensionsR\ndimensions\022K\n\rroute_d"
+    "etails\030% \001(\0132&.anduril.entitymanager.v1."
+    "RouteDetailsR\014routeDetails\022A\n\tschedules\030"
+    "& \001(\0132#.anduril.entitymanager.v1.Schedul"
+    "esR\tschedules\0228\n\006health\030\' \001(\0132 .anduril."
+    "entitymanager.v1.HealthR\006health\022K\n\rgroup"
+    "_details\030( \001(\0132&.anduril.entitymanager.v"
+    "1.GroupDetailsR\014groupDetails\022>\n\010supplies"
+    "\030* \001(\0132\".anduril.entitymanager.v1.Suppli"
+    "esR\010supplies\0225\n\005orbit\030. \001(\0132\037.anduril.en"
+    "titymanager.v1.OrbitR\005orbitJ\004\010\t\020\nJ\004\010\020\020\021J"
+    "\004\010\021\020\022J\004\010\022\020\023J\004\010\033\020\034J\004\010\034\020\035J\004\010)\020*J\004\010+\020,R\ncor"
+    "relatedR\roriginal_dataR\ngeopolygonR\007cont"
+    "actR\013team_statusR\tno_expiry\"I\n\006Status\022+\n"
+    "\021platform_activity\030\001 \001(\tR\020platformActivi"
+    "ty\022\022\n\004role\030\002 \001(\tR\004role\"s\n\007Aliases\022O\n\ralt"
+    "ernate_ids\030\001 \003(\0132%.anduril.entitymanager"
+    ".v1.AlternateIdB\003\310>\001R\014alternateIds\022\027\n\004na"
+    "me\030\002 \001(\tB\003\310>\001R\004name\"\236\004\n\007Tracked\022O\n\025track"
+    "_quality_wrapper\030\002 \001(\0132\033.google.protobuf"
+    ".Int32ValueR\023trackQualityWrapper\022<\n\013sens"
+    "or_hits\030\003 \001(\0132\033.google.protobuf.Int32Val"
+    "ueR\nsensorHits\022Q\n\021number_of_objects\030\004 \001("
+    "\0132%.anduril.entitymanager.v1.UInt32Range"
+    "R\017numberOfObjects\022L\n\023radar_cross_section"
+    "\030\006 \001(\0132\034.google.protobuf.DoubleValueR\021ra"
+    "darCrossSection\022N\n\025last_measurement_time"
+    "\030\007 \001(\0132\032.google.protobuf.TimestampR\023last"
+    "MeasurementTime\022O\n\017line_of_bearing\030\t \001(\013"
+    "2\'.anduril.entitymanager.v1.LineOfBearin"
+    "gR\rlineOfBearingJ\004\010\001\020\002J\004\010\005\020\006J\004\010\010\020\tR\rtrac"
+    "k_qualityR\016sensor_detailsR\021relative_posi"
+    "tion\"\360\001\n\nProvenance\022)\n\020integration_name\030"
+    "\005 \001(\tR\017integrationName\022\033\n\tdata_type\030\006 \001("
+    "\tR\010dataType\022\033\n\tsource_id\030\003 \001(\tR\010sourceId"
+    "\022H\n\022source_update_time\030\002 \001(\0132\032.google.pr"
+    "otobuf.TimestampR\020sourceUpdateTime\022-\n\022so"
+    "urce_description\030\004 \001(\tR\021sourceDescriptio"
+    "nJ\004\010\001\020\002\"\361\002\n\nIndicators\0228\n\tsimulated\030\001 \001("
+    "\0132\032.google.protobuf.BoolValueR\tsimulated"
+    "\0226\n\010exercise\030\002 \001(\0132\032.google.protobuf.Boo"
+    "lValueR\010exercise\0228\n\temergency\030\003 \001(\0132\032.go"
+    "ogle.protobuf.BoolValueR\temergency\022*\n\002c2"
+    "\030\004 \001(\0132\032.google.protobuf.BoolValueR\002c2\022\?"
+    "\n\negressable\030\006 \001(\0132\032.google.protobuf.Boo"
+    "lValueB\003\310>\001R\negressable\0229\n\007starred\030\007 \001(\013"
+    "2\032.google.protobuf.BoolValueB\003\310>\001R\007starr"
+    "edJ\004\010\005\020\006R\tdeletable\"]\n\tOverrides\022>\n\010over"
+    "ride\030\002 \003(\0132\".anduril.entitymanager.v1.Ov"
+    "errideR\010overrideJ\004\010\001\020\002R\nprovenance\"\245\003\n\010O"
+    "verride\022\035\n\nrequest_id\030\001 \001(\tR\trequestId\022\035"
+    "\n\nfield_path\030\002 \001(\tR\tfieldPath\022N\n\022masked_"
+    "field_value\030\003 \001(\0132 .anduril.entitymanage"
+    "r.v1.EntityR\020maskedFieldValue\022@\n\006status\030"
+    "\004 \001(\0162(.anduril.entitymanager.v1.Overrid"
+    "eStatusR\006status\022D\n\nprovenance\030\005 \001(\0132$.an"
+    "duril.entitymanager.v1.ProvenanceR\nprove"
+    "nance\022:\n\004type\030\006 \001(\0162&.anduril.entitymana"
+    "ger.v1.OverrideTypeR\004type\022G\n\021request_tim"
+    "estamp\030\007 \001(\0132\032.google.protobuf.Timestamp"
+    "R\020requestTimestamp\"d\n\013AlternateId\022\016\n\002id\030"
+    "\002 \001(\tR\002id\0227\n\004type\030\003 \001(\0162#.anduril.entity"
+    "manager.v1.AltIdTypeR\004typeJ\004\010\001\020\002R\006source"
+    "\"[\n\rVisualDetails\022J\n\013range_rings\030\001 \001(\0132$"
+    ".anduril.entitymanager.v1.RangeRingsB\003\310>"
+    "\001R\nrangeRings\"\360\001\n\nRangeRings\022B\n\016min_dist"
+    "ance_m\030\001 \001(\0132\034.google.protobuf.DoubleVal"
+    "ueR\014minDistanceM\022B\n\016max_distance_m\030\002 \001(\013"
+    "2\034.google.protobuf.DoubleValueR\014maxDista"
+    "nceM\022\035\n\nring_count\030\003 \001(\rR\tringCount\022;\n\017r"
+    "ing_line_color\030\004 \001(\0132\023.anduril.type.Colo"
+    "rR\rringLineColor\"\326\002\n\013Correlation\022H\n\007prim"
+    "ary\030\001 \001(\0132,.anduril.entitymanager.v1.Pri"
+    "maryCorrelationH\000R\007primary\022N\n\tsecondary\030"
+    "\002 \001(\0132..anduril.entitymanager.v1.Seconda"
+    "ryCorrelationH\000R\tsecondary\022O\n\nmembership"
+    "\030\004 \001(\0132/.anduril.entitymanager.v1.Correl"
+    "ationMembershipR\nmembership\022M\n\rdecorrela"
+    "tion\030\003 \001(\0132\'.anduril.entitymanager.v1.De"
+    "correlationR\rdecorrelationB\r\n\013correlatio"
+    "n\"F\n\022PrimaryCorrelation\0220\n\024secondary_ent"
+    "ity_ids\030\001 \003(\tR\022secondaryEntityIds\"\215\001\n\024Se"
+    "condaryCorrelation\022*\n\021primary_entity_id\030"
+    "\001 \001(\tR\017primaryEntityId\022I\n\010metadata\030\002 \001(\013"
+    "2-.anduril.entitymanager.v1.CorrelationM"
+    "etadataR\010metadata\"\272\002\n\025CorrelationMembers"
+    "hip\022,\n\022correlation_set_id\030\001 \001(\tR\020correla"
+    "tionSetId\022G\n\007primary\030\002 \001(\0132+.anduril.ent"
+    "itymanager.v1.PrimaryMembershipH\000R\007prima"
+    "ry\022Q\n\013non_primary\030\003 \001(\0132..anduril.entity"
+    "manager.v1.NonPrimaryMembershipH\000R\nnonPr"
+    "imary\022I\n\010metadata\030\004 \001(\0132-.anduril.entity"
+    "manager.v1.CorrelationMetadataR\010metadata"
+    "B\014\n\nmembership\"\023\n\021PrimaryMembership\"\026\n\024N"
+    "onPrimaryMembership\"\257\001\n\rDecorrelation\022;\n"
+    "\003all\030\001 \001(\0132).anduril.entitymanager.v1.De"
+    "correlatedAllR\003all\022a\n\025decorrelated_entit"
+    "ies\030\002 \003(\0132,.anduril.entitymanager.v1.Dec"
+    "orrelatedSingleR\024decorrelatedEntities\"\\\n"
+    "\017DecorrelatedAll\022I\n\010metadata\030\001 \001(\0132-.and"
+    "uril.entitymanager.v1.CorrelationMetadat"
+    "aR\010metadata\"|\n\022DecorrelatedSingle\022\033\n\tent"
+    "ity_id\030\001 \001(\tR\010entityId\022I\n\010metadata\030\002 \001(\013"
+    "2-.anduril.entitymanager.v1.CorrelationM"
+    "etadataR\010metadata\"\373\001\n\023CorrelationMetadat"
+    "a\022D\n\nprovenance\030\001 \001(\0132$.anduril.entityma"
+    "nager.v1.ProvenanceR\nprovenance\022_\n\020repli"
+    "cation_mode\030\002 \001(\01624.anduril.entitymanage"
+    "r.v1.CorrelationReplicationModeR\017replica"
+    "tionMode\022=\n\004type\030\003 \001(\0162).anduril.entitym"
+    "anager.v1.CorrelationTypeR\004type*l\n\017Corre"
+    "lationType\022\034\n\030CORRELATION_TYPE_INVALID\020\000"
+    "\022\033\n\027CORRELATION_TYPE_MANUAL\020\001\022\036\n\032CORRELA"
+    "TION_TYPE_AUTOMATED\020\002*\227\001\n\032CorrelationRep"
+    "licationMode\022(\n$CORRELATION_REPLICATION_"
+    "MODE_INVALID\020\000\022&\n\"CORRELATION_REPLICATIO"
+    "N_MODE_LOCAL\020\001\022\'\n#CORRELATION_REPLICATIO"
+    "N_MODE_GLOBAL\020\002B\377\001\n\034com.anduril.entityma"
+    "nager.v1B\016EntityPubProtoP\001ZMghe.anduril."
+    "dev/anduril/andurilapis-go/anduril/entit"
+    "ymanager/v1;entitymanager\242\002\003AEX\252\002\030Anduri"
+    "l.Entitymanager.V1\312\002\030Anduril\\Entitymanag"
+    "er\\V1\342\002$Anduril\\Entitymanager\\V1\\GPBMeta"
+    "data\352\002\032Anduril::Entitymanager::V1b\006proto"
+    "3"
 };
-static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto_deps[24] =
+static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto_deps[25] =
     {
         &::descriptor_table_anduril_2fentitymanager_2fv1_2fclassification_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2fdimensions_2epub_2eproto,
@@ -1250,6 +1256,7 @@ static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentityman
         &::descriptor_table_anduril_2fentitymanager_2fv1_2fgroup_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2fhealth_5fstatus_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2flocation_2epub_2eproto,
+        &::descriptor_table_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2fontology_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2foptions_2epub_2eproto,
         &::descriptor_table_anduril_2fentitymanager_2fv1_2forbit_2epub_2eproto,
@@ -1273,12 +1280,12 @@ static ::absl::once_flag descriptor_table_anduril_2fentitymanager_2fv1_2fentity_
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto = {
     false,
     false,
-    7997,
+    8081,
     descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto,
     "anduril/entitymanager/v1/entity.pub.proto",
     &descriptor_table_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto_once,
     descriptor_table_anduril_2fentitymanager_2fv1_2fentity_2epub_2eproto_deps,
-    24,
+    25,
     21,
     schemas,
     file_default_instances,
@@ -1397,45 +1404,50 @@ void Entity::clear_task_catalog() {
   if (_impl_.task_catalog_ != nullptr) _impl_.task_catalog_->Clear();
   _impl_._has_bits_[0] &= ~0x00200000u;
 }
+void Entity::clear_media() {
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+  if (_impl_.media_ != nullptr) _impl_.media_->Clear();
+  _impl_._has_bits_[0] &= ~0x00400000u;
+}
 void Entity::clear_relationships() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.relationships_ != nullptr) _impl_.relationships_->Clear();
-  _impl_._has_bits_[0] &= ~0x00400000u;
+  _impl_._has_bits_[0] &= ~0x00800000u;
 }
 void Entity::clear_dimensions() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.dimensions_ != nullptr) _impl_.dimensions_->Clear();
-  _impl_._has_bits_[0] &= ~0x01000000u;
+  _impl_._has_bits_[0] &= ~0x02000000u;
 }
 void Entity::clear_route_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.route_details_ != nullptr) _impl_.route_details_->Clear();
-  _impl_._has_bits_[0] &= ~0x02000000u;
+  _impl_._has_bits_[0] &= ~0x04000000u;
 }
 void Entity::clear_schedules() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.schedules_ != nullptr) _impl_.schedules_->Clear();
-  _impl_._has_bits_[0] &= ~0x04000000u;
+  _impl_._has_bits_[0] &= ~0x08000000u;
 }
 void Entity::clear_health() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.health_ != nullptr) _impl_.health_->Clear();
-  _impl_._has_bits_[0] &= ~0x08000000u;
+  _impl_._has_bits_[0] &= ~0x10000000u;
 }
 void Entity::clear_group_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.group_details_ != nullptr) _impl_.group_details_->Clear();
-  _impl_._has_bits_[0] &= ~0x10000000u;
+  _impl_._has_bits_[0] &= ~0x20000000u;
 }
 void Entity::clear_supplies() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.supplies_ != nullptr) _impl_.supplies_->Clear();
-  _impl_._has_bits_[0] &= ~0x20000000u;
+  _impl_._has_bits_[0] &= ~0x40000000u;
 }
 void Entity::clear_orbit() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.orbit_ != nullptr) _impl_.orbit_->Clear();
-  _impl_._has_bits_[0] &= ~0x40000000u;
+  _impl_._has_bits_[0] &= ~0x80000000u;
 }
 Entity::Entity(::google::protobuf::Arena* arena)
 #if defined(PROTOBUF_CUSTOM_VTABLE)
@@ -1534,34 +1546,38 @@ Entity::Entity(
   _impl_.task_catalog_ = (cached_has_bits & 0x00200000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::tasks::v2::TaskCatalog>(
                               arena, *from._impl_.task_catalog_)
                         : nullptr;
-  _impl_.relationships_ = (cached_has_bits & 0x00400000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Relationships>(
+  _impl_.media_ = (cached_has_bits & 0x00400000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Media>(
+                              arena, *from._impl_.media_)
+                        : nullptr;
+  _impl_.relationships_ = (cached_has_bits & 0x00800000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Relationships>(
                               arena, *from._impl_.relationships_)
                         : nullptr;
-  _impl_.visual_details_ = (cached_has_bits & 0x00800000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::VisualDetails>(
+  _impl_.visual_details_ = (cached_has_bits & 0x01000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::VisualDetails>(
                               arena, *from._impl_.visual_details_)
                         : nullptr;
-  _impl_.dimensions_ = (cached_has_bits & 0x01000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Dimensions>(
+  _impl_.dimensions_ = (cached_has_bits & 0x02000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Dimensions>(
                               arena, *from._impl_.dimensions_)
                         : nullptr;
-  _impl_.route_details_ = (cached_has_bits & 0x02000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::RouteDetails>(
+  _impl_.route_details_ = (cached_has_bits & 0x04000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::RouteDetails>(
                               arena, *from._impl_.route_details_)
                         : nullptr;
-  _impl_.schedules_ = (cached_has_bits & 0x04000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Schedules>(
+  _impl_.schedules_ = (cached_has_bits & 0x08000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Schedules>(
                               arena, *from._impl_.schedules_)
                         : nullptr;
-  _impl_.health_ = (cached_has_bits & 0x08000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Health>(
+  _impl_.health_ = (cached_has_bits & 0x10000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Health>(
                               arena, *from._impl_.health_)
                         : nullptr;
-  _impl_.group_details_ = (cached_has_bits & 0x10000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::GroupDetails>(
+  _impl_.group_details_ = (cached_has_bits & 0x20000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::GroupDetails>(
                               arena, *from._impl_.group_details_)
                         : nullptr;
-  _impl_.supplies_ = (cached_has_bits & 0x20000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Supplies>(
+  _impl_.supplies_ = (cached_has_bits & 0x40000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Supplies>(
                               arena, *from._impl_.supplies_)
                         : nullptr;
-  _impl_.orbit_ = (cached_has_bits & 0x40000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Orbit>(
+  _impl_.orbit_ = (cached_has_bits & 0x80000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Orbit>(
                               arena, *from._impl_.orbit_)
                         : nullptr;
-  _impl_.correlation_ = (cached_has_bits & 0x80000000u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Correlation>(
+  cached_has_bits = _impl_._has_bits_[1];
+  _impl_.correlation_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Correlation>(
                               arena, *from._impl_.correlation_)
                         : nullptr;
   _impl_.is_live_ = from._impl_.is_live_;
@@ -1616,6 +1632,7 @@ inline void Entity::SharedDtor(MessageLite& self) {
   delete this_._impl_.data_classification_;
   delete this_._impl_.power_state_;
   delete this_._impl_.task_catalog_;
+  delete this_._impl_.media_;
   delete this_._impl_.relationships_;
   delete this_._impl_.visual_details_;
   delete this_._impl_.dimensions_;
@@ -1665,16 +1682,16 @@ const ::google::protobuf::internal::ClassData* Entity::GetClassData() const {
   return _class_data_.base();
 }
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<5, 35, 32, 92, 7> Entity::_table_ = {
+const ::_pbi::TcParseTable<5, 36, 33, 92, 7> Entity::_table_ = {
   {
     PROTOBUF_FIELD_OFFSET(Entity, _impl_._has_bits_),
     0, // no _extensions_
     47, 248,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
-    2349039872,  // skipmap
+    201556224,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    35,  // num_field_entries
-    32,  // num_aux_entries
+    36,  // num_field_entries
+    33,  // num_aux_entries
     offsetof(decltype(_table_), aux_entries),
     _class_data_.base(),
     nullptr,  // post_loop_handler
@@ -1727,13 +1744,15 @@ const ::_pbi::TcParseTable<5, 35, 32, 92, 7> Entity::_table_ = {
     // .anduril.entitymanager.v1.LocationUncertainty location_uncertainty = 15 [json_name = "locationUncertainty"];
     {::_pbi::TcParser::FastMtS1,
      {122, 10, 10, PROTOBUF_FIELD_OFFSET(Entity, _impl_.location_uncertainty_)}},
-    {::_pbi::TcParser::MiniParse, {}},
+    // .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
+    {::_pbi::TcParser::FastMtS2,
+     {642, 22, 22, PROTOBUF_FIELD_OFFSET(Entity, _impl_.media_)}},
     // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
     {::_pbi::TcParser::FastMtS2,
-     {650, 22, 22, PROTOBUF_FIELD_OFFSET(Entity, _impl_.relationships_)}},
+     {650, 23, 23, PROTOBUF_FIELD_OFFSET(Entity, _impl_.relationships_)}},
     // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
     {::_pbi::TcParser::FastMtS2,
-     {658, 23, 23, PROTOBUF_FIELD_OFFSET(Entity, _impl_.visual_details_)}},
+     {658, 24, 24, PROTOBUF_FIELD_OFFSET(Entity, _impl_.visual_details_)}},
     // .anduril.entitymanager.v1.Status status = 19 [json_name = "status"];
     {::_pbi::TcParser::FastMtS2,
      {410, 11, 11, PROTOBUF_FIELD_OFFSET(Entity, _impl_.status_)}},
@@ -1771,7 +1790,7 @@ const ::_pbi::TcParseTable<5, 35, 32, 92, 7> Entity::_table_ = {
      {506, 21, 21, PROTOBUF_FIELD_OFFSET(Entity, _impl_.task_catalog_)}},
   }}, {{
     33, 0, 1,
-    40196, 25,
+    40196, 26,
     65535, 65535
   }}, {{
     // string entity_id = 1 [json_name = "entityId"];
@@ -1849,35 +1868,38 @@ const ::_pbi::TcParseTable<5, 35, 32, 92, 7> Entity::_table_ = {
     // .anduril.tasks.v2.TaskCatalog task_catalog = 31 [json_name = "taskCatalog", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Entity, _impl_.task_catalog_), _Internal::kHasBitsOffset + 21, 21,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
+    // .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.media_), _Internal::kHasBitsOffset + 22, 22,
+    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.relationships_), _Internal::kHasBitsOffset + 22, 22,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.relationships_), _Internal::kHasBitsOffset + 23, 23,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.visual_details_), _Internal::kHasBitsOffset + 23, 23,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.visual_details_), _Internal::kHasBitsOffset + 24, 24,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Dimensions dimensions = 36 [json_name = "dimensions"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.dimensions_), _Internal::kHasBitsOffset + 24, 24,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.dimensions_), _Internal::kHasBitsOffset + 25, 25,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.RouteDetails route_details = 37 [json_name = "routeDetails"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.route_details_), _Internal::kHasBitsOffset + 25, 25,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.route_details_), _Internal::kHasBitsOffset + 26, 26,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Schedules schedules = 38 [json_name = "schedules"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.schedules_), _Internal::kHasBitsOffset + 26, 26,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.schedules_), _Internal::kHasBitsOffset + 27, 27,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Health health = 39 [json_name = "health"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.health_), _Internal::kHasBitsOffset + 27, 27,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.health_), _Internal::kHasBitsOffset + 28, 28,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.GroupDetails group_details = 40 [json_name = "groupDetails"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.group_details_), _Internal::kHasBitsOffset + 28, 28,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.group_details_), _Internal::kHasBitsOffset + 29, 29,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Supplies supplies = 42 [json_name = "supplies"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.supplies_), _Internal::kHasBitsOffset + 29, 29,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.supplies_), _Internal::kHasBitsOffset + 30, 30,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Orbit orbit = 46 [json_name = "orbit"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.orbit_), _Internal::kHasBitsOffset + 30, 30,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.orbit_), _Internal::kHasBitsOffset + 31, 31,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.Correlation correlation = 47 [json_name = "correlation"];
-    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.correlation_), _Internal::kHasBitsOffset + 31, 31,
+    {PROTOBUF_FIELD_OFFSET(Entity, _impl_.correlation_), _Internal::kHasBitsOffset + 32, 32,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
   }}, {{
     {::_pbi::TcParser::GetTable<::google::protobuf::Timestamp>()},
@@ -1902,6 +1924,7 @@ const ::_pbi::TcParseTable<5, 35, 32, 92, 7> Entity::_table_ = {
     {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::Classification>()},
     {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::PowerState>()},
     {::_pbi::TcParser::GetTable<::anduril::tasks::v2::TaskCatalog>()},
+    {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::Media>()},
     {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::Relationships>()},
     {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::VisualDetails>()},
     {::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::Dimensions>()},
@@ -2024,47 +2047,52 @@ PROTOBUF_NOINLINE void Entity::Clear() {
       _impl_.task_catalog_->Clear();
     }
     if (cached_has_bits & 0x00400000u) {
-      ABSL_DCHECK(_impl_.relationships_ != nullptr);
-      _impl_.relationships_->Clear();
+      ABSL_DCHECK(_impl_.media_ != nullptr);
+      _impl_.media_->Clear();
     }
     if (cached_has_bits & 0x00800000u) {
-      ABSL_DCHECK(_impl_.visual_details_ != nullptr);
-      _impl_.visual_details_->Clear();
+      ABSL_DCHECK(_impl_.relationships_ != nullptr);
+      _impl_.relationships_->Clear();
     }
   }
   if (cached_has_bits & 0xff000000u) {
     if (cached_has_bits & 0x01000000u) {
+      ABSL_DCHECK(_impl_.visual_details_ != nullptr);
+      _impl_.visual_details_->Clear();
+    }
+    if (cached_has_bits & 0x02000000u) {
       ABSL_DCHECK(_impl_.dimensions_ != nullptr);
       _impl_.dimensions_->Clear();
     }
-    if (cached_has_bits & 0x02000000u) {
+    if (cached_has_bits & 0x04000000u) {
       ABSL_DCHECK(_impl_.route_details_ != nullptr);
       _impl_.route_details_->Clear();
     }
-    if (cached_has_bits & 0x04000000u) {
+    if (cached_has_bits & 0x08000000u) {
       ABSL_DCHECK(_impl_.schedules_ != nullptr);
       _impl_.schedules_->Clear();
     }
-    if (cached_has_bits & 0x08000000u) {
+    if (cached_has_bits & 0x10000000u) {
       ABSL_DCHECK(_impl_.health_ != nullptr);
       _impl_.health_->Clear();
     }
-    if (cached_has_bits & 0x10000000u) {
+    if (cached_has_bits & 0x20000000u) {
       ABSL_DCHECK(_impl_.group_details_ != nullptr);
       _impl_.group_details_->Clear();
     }
-    if (cached_has_bits & 0x20000000u) {
+    if (cached_has_bits & 0x40000000u) {
       ABSL_DCHECK(_impl_.supplies_ != nullptr);
       _impl_.supplies_->Clear();
     }
-    if (cached_has_bits & 0x40000000u) {
+    if (cached_has_bits & 0x80000000u) {
       ABSL_DCHECK(_impl_.orbit_ != nullptr);
       _impl_.orbit_->Clear();
     }
-    if (cached_has_bits & 0x80000000u) {
-      ABSL_DCHECK(_impl_.correlation_ != nullptr);
-      _impl_.correlation_->Clear();
-    }
+  }
+  cached_has_bits = _impl_._has_bits_[1];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(_impl_.correlation_ != nullptr);
+    _impl_.correlation_->Clear();
   }
   _impl_.is_live_ = false;
   _impl_._has_bits_.Clear();
@@ -2264,71 +2292,79 @@ PROTOBUF_NOINLINE void Entity::Clear() {
                 stream);
           }
 
-          // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
+          // .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
           if (cached_has_bits & 0x00400000u) {
+            target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
+                32, *this_._impl_.media_, this_._impl_.media_->GetCachedSize(), target,
+                stream);
+          }
+
+          // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
+          if (cached_has_bits & 0x00800000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 33, *this_._impl_.relationships_, this_._impl_.relationships_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
-          if (cached_has_bits & 0x00800000u) {
+          if (cached_has_bits & 0x01000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 34, *this_._impl_.visual_details_, this_._impl_.visual_details_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.Dimensions dimensions = 36 [json_name = "dimensions"];
-          if (cached_has_bits & 0x01000000u) {
+          if (cached_has_bits & 0x02000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 36, *this_._impl_.dimensions_, this_._impl_.dimensions_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.RouteDetails route_details = 37 [json_name = "routeDetails"];
-          if (cached_has_bits & 0x02000000u) {
+          if (cached_has_bits & 0x04000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 37, *this_._impl_.route_details_, this_._impl_.route_details_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.Schedules schedules = 38 [json_name = "schedules"];
-          if (cached_has_bits & 0x04000000u) {
+          if (cached_has_bits & 0x08000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 38, *this_._impl_.schedules_, this_._impl_.schedules_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.Health health = 39 [json_name = "health"];
-          if (cached_has_bits & 0x08000000u) {
+          if (cached_has_bits & 0x10000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 39, *this_._impl_.health_, this_._impl_.health_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.GroupDetails group_details = 40 [json_name = "groupDetails"];
-          if (cached_has_bits & 0x10000000u) {
+          if (cached_has_bits & 0x20000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 40, *this_._impl_.group_details_, this_._impl_.group_details_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.Supplies supplies = 42 [json_name = "supplies"];
-          if (cached_has_bits & 0x20000000u) {
+          if (cached_has_bits & 0x40000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 42, *this_._impl_.supplies_, this_._impl_.supplies_->GetCachedSize(), target,
                 stream);
           }
 
           // .anduril.entitymanager.v1.Orbit orbit = 46 [json_name = "orbit"];
-          if (cached_has_bits & 0x40000000u) {
+          if (cached_has_bits & 0x80000000u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 46, *this_._impl_.orbit_, this_._impl_.orbit_->GetCachedSize(), target,
                 stream);
           }
 
+          cached_has_bits = this_._impl_._has_bits_[1];
           // .anduril.entitymanager.v1.Correlation correlation = 47 [json_name = "correlation"];
-          if (cached_has_bits & 0x80000000u) {
+          if (cached_has_bits & 0x00000001u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 47, *this_._impl_.correlation_, this_._impl_.correlation_->GetCachedSize(), target,
                 stream);
@@ -2486,55 +2522,63 @@ PROTOBUF_NOINLINE void Entity::Clear() {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.task_catalog_);
             }
-            // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
+            // .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
             if (cached_has_bits & 0x00400000u) {
               total_size += 2 +
-                            ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.relationships_);
+                            ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.media_);
             }
-            // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
+            // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
             if (cached_has_bits & 0x00800000u) {
               total_size += 2 +
-                            ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.visual_details_);
+                            ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.relationships_);
             }
           }
           if (cached_has_bits & 0xff000000u) {
-            // .anduril.entitymanager.v1.Dimensions dimensions = 36 [json_name = "dimensions"];
+            // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
             if (cached_has_bits & 0x01000000u) {
+              total_size += 2 +
+                            ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.visual_details_);
+            }
+            // .anduril.entitymanager.v1.Dimensions dimensions = 36 [json_name = "dimensions"];
+            if (cached_has_bits & 0x02000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.dimensions_);
             }
             // .anduril.entitymanager.v1.RouteDetails route_details = 37 [json_name = "routeDetails"];
-            if (cached_has_bits & 0x02000000u) {
+            if (cached_has_bits & 0x04000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.route_details_);
             }
             // .anduril.entitymanager.v1.Schedules schedules = 38 [json_name = "schedules"];
-            if (cached_has_bits & 0x04000000u) {
+            if (cached_has_bits & 0x08000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.schedules_);
             }
             // .anduril.entitymanager.v1.Health health = 39 [json_name = "health"];
-            if (cached_has_bits & 0x08000000u) {
+            if (cached_has_bits & 0x10000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.health_);
             }
             // .anduril.entitymanager.v1.GroupDetails group_details = 40 [json_name = "groupDetails"];
-            if (cached_has_bits & 0x10000000u) {
+            if (cached_has_bits & 0x20000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.group_details_);
             }
             // .anduril.entitymanager.v1.Supplies supplies = 42 [json_name = "supplies"];
-            if (cached_has_bits & 0x20000000u) {
+            if (cached_has_bits & 0x40000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.supplies_);
             }
             // .anduril.entitymanager.v1.Orbit orbit = 46 [json_name = "orbit"];
-            if (cached_has_bits & 0x40000000u) {
+            if (cached_has_bits & 0x80000000u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.orbit_);
             }
+          }
+           {
             // .anduril.entitymanager.v1.Correlation correlation = 47 [json_name = "correlation"];
-            if (cached_has_bits & 0x80000000u) {
+            cached_has_bits = this_._impl_._has_bits_[1];
+            if (cached_has_bits & 0x00000001u) {
               total_size += 2 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.correlation_);
             }
@@ -2769,6 +2813,15 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
       }
     }
     if (cached_has_bits & 0x00400000u) {
+      ABSL_DCHECK(from._impl_.media_ != nullptr);
+      if (_this->_impl_.media_ == nullptr) {
+        _this->_impl_.media_ =
+            ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Media>(arena, *from._impl_.media_);
+      } else {
+        _this->_impl_.media_->MergeFrom(*from._impl_.media_);
+      }
+    }
+    if (cached_has_bits & 0x00800000u) {
       ABSL_DCHECK(from._impl_.relationships_ != nullptr);
       if (_this->_impl_.relationships_ == nullptr) {
         _this->_impl_.relationships_ =
@@ -2777,7 +2830,9 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.relationships_->MergeFrom(*from._impl_.relationships_);
       }
     }
-    if (cached_has_bits & 0x00800000u) {
+  }
+  if (cached_has_bits & 0xff000000u) {
+    if (cached_has_bits & 0x01000000u) {
       ABSL_DCHECK(from._impl_.visual_details_ != nullptr);
       if (_this->_impl_.visual_details_ == nullptr) {
         _this->_impl_.visual_details_ =
@@ -2786,9 +2841,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.visual_details_->MergeFrom(*from._impl_.visual_details_);
       }
     }
-  }
-  if (cached_has_bits & 0xff000000u) {
-    if (cached_has_bits & 0x01000000u) {
+    if (cached_has_bits & 0x02000000u) {
       ABSL_DCHECK(from._impl_.dimensions_ != nullptr);
       if (_this->_impl_.dimensions_ == nullptr) {
         _this->_impl_.dimensions_ =
@@ -2797,7 +2850,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.dimensions_->MergeFrom(*from._impl_.dimensions_);
       }
     }
-    if (cached_has_bits & 0x02000000u) {
+    if (cached_has_bits & 0x04000000u) {
       ABSL_DCHECK(from._impl_.route_details_ != nullptr);
       if (_this->_impl_.route_details_ == nullptr) {
         _this->_impl_.route_details_ =
@@ -2806,7 +2859,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.route_details_->MergeFrom(*from._impl_.route_details_);
       }
     }
-    if (cached_has_bits & 0x04000000u) {
+    if (cached_has_bits & 0x08000000u) {
       ABSL_DCHECK(from._impl_.schedules_ != nullptr);
       if (_this->_impl_.schedules_ == nullptr) {
         _this->_impl_.schedules_ =
@@ -2815,7 +2868,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.schedules_->MergeFrom(*from._impl_.schedules_);
       }
     }
-    if (cached_has_bits & 0x08000000u) {
+    if (cached_has_bits & 0x10000000u) {
       ABSL_DCHECK(from._impl_.health_ != nullptr);
       if (_this->_impl_.health_ == nullptr) {
         _this->_impl_.health_ =
@@ -2824,7 +2877,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.health_->MergeFrom(*from._impl_.health_);
       }
     }
-    if (cached_has_bits & 0x10000000u) {
+    if (cached_has_bits & 0x20000000u) {
       ABSL_DCHECK(from._impl_.group_details_ != nullptr);
       if (_this->_impl_.group_details_ == nullptr) {
         _this->_impl_.group_details_ =
@@ -2833,7 +2886,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.group_details_->MergeFrom(*from._impl_.group_details_);
       }
     }
-    if (cached_has_bits & 0x20000000u) {
+    if (cached_has_bits & 0x40000000u) {
       ABSL_DCHECK(from._impl_.supplies_ != nullptr);
       if (_this->_impl_.supplies_ == nullptr) {
         _this->_impl_.supplies_ =
@@ -2842,7 +2895,7 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.supplies_->MergeFrom(*from._impl_.supplies_);
       }
     }
-    if (cached_has_bits & 0x40000000u) {
+    if (cached_has_bits & 0x80000000u) {
       ABSL_DCHECK(from._impl_.orbit_ != nullptr);
       if (_this->_impl_.orbit_ == nullptr) {
         _this->_impl_.orbit_ =
@@ -2851,20 +2904,21 @@ void Entity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::
         _this->_impl_.orbit_->MergeFrom(*from._impl_.orbit_);
       }
     }
-    if (cached_has_bits & 0x80000000u) {
-      ABSL_DCHECK(from._impl_.correlation_ != nullptr);
-      if (_this->_impl_.correlation_ == nullptr) {
-        _this->_impl_.correlation_ =
-            ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Correlation>(arena, *from._impl_.correlation_);
-      } else {
-        _this->_impl_.correlation_->MergeFrom(*from._impl_.correlation_);
-      }
+  }
+  cached_has_bits = from._impl_._has_bits_[1];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(from._impl_.correlation_ != nullptr);
+    if (_this->_impl_.correlation_ == nullptr) {
+      _this->_impl_.correlation_ =
+          ::google::protobuf::Message::CopyConstruct<::anduril::entitymanager::v1::Correlation>(arena, *from._impl_.correlation_);
+    } else {
+      _this->_impl_.correlation_->MergeFrom(*from._impl_.correlation_);
     }
   }
   if (from._internal_is_live() != 0) {
     _this->_impl_.is_live_ = from._impl_.is_live_;
   }
-  _this->_impl_._has_bits_[0] |= cached_has_bits;
+  _this->_impl_._has_bits_.Or(from._impl_._has_bits_);
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -2882,6 +2936,7 @@ void Entity::InternalSwap(Entity* PROTOBUF_RESTRICT other) {
   ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
+  swap(_impl_._has_bits_[1], other->_impl_._has_bits_[1]);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.entity_id_, &other->_impl_.entity_id_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.description_, &other->_impl_.description_, arena);
   ::google::protobuf::internal::memswap<
diff --git a/src/anduril/entitymanager/v1/entity.pub.pb.h b/src/anduril/entitymanager/v1/entity.pub.pb.h
index c103bb1..62789b7 100644
--- a/src/anduril/entitymanager/v1/entity.pub.pb.h
+++ b/src/anduril/entitymanager/v1/entity.pub.pb.h
@@ -37,6 +37,7 @@
 #include "anduril/entitymanager/v1/group.pub.pb.h"
 #include "anduril/entitymanager/v1/health_status.pub.pb.h"
 #include "anduril/entitymanager/v1/location.pub.pb.h"
+#include "anduril/entitymanager/v1/media.pub.pb.h"
 #include "anduril/entitymanager/v1/ontology.pub.pb.h"
 #include "anduril/entitymanager/v1/options.pub.pb.h"
 #include "anduril/entitymanager/v1/orbit.pub.pb.h"
@@ -4416,6 +4417,7 @@ class Entity final
     kDataClassificationFieldNumber = 29,
     kPowerStateFieldNumber = 30,
     kTaskCatalogFieldNumber = 31,
+    kMediaFieldNumber = 32,
     kRelationshipsFieldNumber = 33,
     kVisualDetailsFieldNumber = 34,
     kDimensionsFieldNumber = 36,
@@ -4789,6 +4791,21 @@ class Entity final
   const ::anduril::tasks::v2::TaskCatalog& _internal_task_catalog() const;
   ::anduril::tasks::v2::TaskCatalog* _internal_mutable_task_catalog();
 
+  public:
+  // .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
+  bool has_media() const;
+  void clear_media() ;
+  const ::anduril::entitymanager::v1::Media& media() const;
+  PROTOBUF_NODISCARD ::anduril::entitymanager::v1::Media* release_media();
+  ::anduril::entitymanager::v1::Media* mutable_media();
+  void set_allocated_media(::anduril::entitymanager::v1::Media* value);
+  void unsafe_arena_set_allocated_media(::anduril::entitymanager::v1::Media* value);
+  ::anduril::entitymanager::v1::Media* unsafe_arena_release_media();
+
+  private:
+  const ::anduril::entitymanager::v1::Media& _internal_media() const;
+  ::anduril::entitymanager::v1::Media* _internal_mutable_media();
+
   public:
   // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
   bool has_relationships() const;
@@ -4955,7 +4972,7 @@ class Entity final
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      5, 35, 32,
+      5, 36, 33,
       92, 7>
       _table_;
 
@@ -4973,7 +4990,7 @@ class Entity final
     inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
                           ::google::protobuf::Arena* arena, const Impl_& from,
                           const Entity& from_msg);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
+    ::google::protobuf::internal::HasBits<2> _has_bits_;
     ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::internal::ArenaStringPtr entity_id_;
     ::google::protobuf::internal::ArenaStringPtr description_;
@@ -4999,6 +5016,7 @@ class Entity final
     ::anduril::entitymanager::v1::Classification* data_classification_;
     ::anduril::entitymanager::v1::PowerState* power_state_;
     ::anduril::tasks::v2::TaskCatalog* task_catalog_;
+    ::anduril::entitymanager::v1::Media* media_;
     ::anduril::entitymanager::v1::Relationships* relationships_;
     ::anduril::entitymanager::v1::VisualDetails* visual_details_;
     ::anduril::entitymanager::v1::Dimensions* dimensions_;
@@ -6475,14 +6493,14 @@ inline void Entity::set_allocated_tracked(::anduril::entitymanager::v1::Tracked*
 
 // .anduril.entitymanager.v1.Correlation correlation = 47 [json_name = "correlation"];
 inline bool Entity::has_correlation() const {
-  bool value = (_impl_._has_bits_[0] & 0x80000000u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000001u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.correlation_ != nullptr);
   return value;
 }
 inline void Entity::clear_correlation() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.correlation_ != nullptr) _impl_.correlation_->Clear();
-  _impl_._has_bits_[0] &= ~0x80000000u;
+  _impl_._has_bits_[1] &= ~0x00000001u;
 }
 inline const ::anduril::entitymanager::v1::Correlation& Entity::_internal_correlation() const {
   ::google::protobuf::internal::TSanRead(&_impl_);
@@ -6500,16 +6518,16 @@ inline void Entity::unsafe_arena_set_allocated_correlation(::anduril::entitymana
   }
   _impl_.correlation_ = reinterpret_cast<::anduril::entitymanager::v1::Correlation*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x80000000u;
+    _impl_._has_bits_[1] |= 0x00000001u;
   } else {
-    _impl_._has_bits_[0] &= ~0x80000000u;
+    _impl_._has_bits_[1] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.correlation)
 }
 inline ::anduril::entitymanager::v1::Correlation* Entity::release_correlation() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x80000000u;
+  _impl_._has_bits_[1] &= ~0x00000001u;
   ::anduril::entitymanager::v1::Correlation* released = _impl_.correlation_;
   _impl_.correlation_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -6529,7 +6547,7 @@ inline ::anduril::entitymanager::v1::Correlation* Entity::unsafe_arena_release_c
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.correlation)
 
-  _impl_._has_bits_[0] &= ~0x80000000u;
+  _impl_._has_bits_[1] &= ~0x00000001u;
   ::anduril::entitymanager::v1::Correlation* temp = _impl_.correlation_;
   _impl_.correlation_ = nullptr;
   return temp;
@@ -6543,7 +6561,7 @@ inline ::anduril::entitymanager::v1::Correlation* Entity::_internal_mutable_corr
   return _impl_.correlation_;
 }
 inline ::anduril::entitymanager::v1::Correlation* Entity::mutable_correlation() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x80000000u;
+  _impl_._has_bits_[1] |= 0x00000001u;
   ::anduril::entitymanager::v1::Correlation* _msg = _internal_mutable_correlation();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.correlation)
   return _msg;
@@ -6560,9 +6578,9 @@ inline void Entity::set_allocated_correlation(::anduril::entitymanager::v1::Corr
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x80000000u;
+    _impl_._has_bits_[1] |= 0x00000001u;
   } else {
-    _impl_._has_bits_[0] &= ~0x80000000u;
+    _impl_._has_bits_[1] &= ~0x00000001u;
   }
 
   _impl_.correlation_ = reinterpret_cast<::anduril::entitymanager::v1::Correlation*>(value);
@@ -7767,9 +7785,100 @@ inline void Entity::set_allocated_task_catalog(::anduril::tasks::v2::TaskCatalog
   // @@protoc_insertion_point(field_set_allocated:anduril.entitymanager.v1.Entity.task_catalog)
 }
 
+// .anduril.entitymanager.v1.Media media = 32 [json_name = "media"];
+inline bool Entity::has_media() const {
+  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.media_ != nullptr);
+  return value;
+}
+inline const ::anduril::entitymanager::v1::Media& Entity::_internal_media() const {
+  ::google::protobuf::internal::TSanRead(&_impl_);
+  const ::anduril::entitymanager::v1::Media* p = _impl_.media_;
+  return p != nullptr ? *p : reinterpret_cast<const ::anduril::entitymanager::v1::Media&>(::anduril::entitymanager::v1::_Media_default_instance_);
+}
+inline const ::anduril::entitymanager::v1::Media& Entity::media() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  // @@protoc_insertion_point(field_get:anduril.entitymanager.v1.Entity.media)
+  return _internal_media();
+}
+inline void Entity::unsafe_arena_set_allocated_media(::anduril::entitymanager::v1::Media* value) {
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+  if (GetArena() == nullptr) {
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.media_);
+  }
+  _impl_.media_ = reinterpret_cast<::anduril::entitymanager::v1::Media*>(value);
+  if (value != nullptr) {
+    _impl_._has_bits_[0] |= 0x00400000u;
+  } else {
+    _impl_._has_bits_[0] &= ~0x00400000u;
+  }
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.media)
+}
+inline ::anduril::entitymanager::v1::Media* Entity::release_media() {
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+
+  _impl_._has_bits_[0] &= ~0x00400000u;
+  ::anduril::entitymanager::v1::Media* released = _impl_.media_;
+  _impl_.media_ = nullptr;
+  if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
+    auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
+    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
+    if (GetArena() == nullptr) {
+      delete old;
+    }
+  } else {
+    if (GetArena() != nullptr) {
+      released = ::google::protobuf::internal::DuplicateIfNonNull(released);
+    }
+  }
+  return released;
+}
+inline ::anduril::entitymanager::v1::Media* Entity::unsafe_arena_release_media() {
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+  // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.media)
+
+  _impl_._has_bits_[0] &= ~0x00400000u;
+  ::anduril::entitymanager::v1::Media* temp = _impl_.media_;
+  _impl_.media_ = nullptr;
+  return temp;
+}
+inline ::anduril::entitymanager::v1::Media* Entity::_internal_mutable_media() {
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+  if (_impl_.media_ == nullptr) {
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::anduril::entitymanager::v1::Media>(GetArena());
+    _impl_.media_ = reinterpret_cast<::anduril::entitymanager::v1::Media*>(p);
+  }
+  return _impl_.media_;
+}
+inline ::anduril::entitymanager::v1::Media* Entity::mutable_media() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00400000u;
+  ::anduril::entitymanager::v1::Media* _msg = _internal_mutable_media();
+  // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.media)
+  return _msg;
+}
+inline void Entity::set_allocated_media(::anduril::entitymanager::v1::Media* value) {
+  ::google::protobuf::Arena* message_arena = GetArena();
+  ::google::protobuf::internal::TSanWrite(&_impl_);
+  if (message_arena == nullptr) {
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.media_);
+  }
+
+  if (value != nullptr) {
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    if (message_arena != submessage_arena) {
+      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
+    }
+    _impl_._has_bits_[0] |= 0x00400000u;
+  } else {
+    _impl_._has_bits_[0] &= ~0x00400000u;
+  }
+
+  _impl_.media_ = reinterpret_cast<::anduril::entitymanager::v1::Media*>(value);
+  // @@protoc_insertion_point(field_set_allocated:anduril.entitymanager.v1.Entity.media)
+}
+
 // .anduril.entitymanager.v1.Relationships relationships = 33 [json_name = "relationships"];
 inline bool Entity::has_relationships() const {
-  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00800000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.relationships_ != nullptr);
   return value;
 }
@@ -7789,16 +7898,16 @@ inline void Entity::unsafe_arena_set_allocated_relationships(::anduril::entityma
   }
   _impl_.relationships_ = reinterpret_cast<::anduril::entitymanager::v1::Relationships*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00400000u;
+    _impl_._has_bits_[0] |= 0x00800000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x00400000u;
+    _impl_._has_bits_[0] &= ~0x00800000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.relationships)
 }
 inline ::anduril::entitymanager::v1::Relationships* Entity::release_relationships() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x00400000u;
+  _impl_._has_bits_[0] &= ~0x00800000u;
   ::anduril::entitymanager::v1::Relationships* released = _impl_.relationships_;
   _impl_.relationships_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -7818,7 +7927,7 @@ inline ::anduril::entitymanager::v1::Relationships* Entity::unsafe_arena_release
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.relationships)
 
-  _impl_._has_bits_[0] &= ~0x00400000u;
+  _impl_._has_bits_[0] &= ~0x00800000u;
   ::anduril::entitymanager::v1::Relationships* temp = _impl_.relationships_;
   _impl_.relationships_ = nullptr;
   return temp;
@@ -7832,7 +7941,7 @@ inline ::anduril::entitymanager::v1::Relationships* Entity::_internal_mutable_re
   return _impl_.relationships_;
 }
 inline ::anduril::entitymanager::v1::Relationships* Entity::mutable_relationships() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x00400000u;
+  _impl_._has_bits_[0] |= 0x00800000u;
   ::anduril::entitymanager::v1::Relationships* _msg = _internal_mutable_relationships();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.relationships)
   return _msg;
@@ -7849,9 +7958,9 @@ inline void Entity::set_allocated_relationships(::anduril::entitymanager::v1::Re
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x00400000u;
+    _impl_._has_bits_[0] |= 0x00800000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x00400000u;
+    _impl_._has_bits_[0] &= ~0x00800000u;
   }
 
   _impl_.relationships_ = reinterpret_cast<::anduril::entitymanager::v1::Relationships*>(value);
@@ -7860,14 +7969,14 @@ inline void Entity::set_allocated_relationships(::anduril::entitymanager::v1::Re
 
 // .anduril.entitymanager.v1.VisualDetails visual_details = 34 [json_name = "visualDetails"];
 inline bool Entity::has_visual_details() const {
-  bool value = (_impl_._has_bits_[0] & 0x00800000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x01000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.visual_details_ != nullptr);
   return value;
 }
 inline void Entity::clear_visual_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   if (_impl_.visual_details_ != nullptr) _impl_.visual_details_->Clear();
-  _impl_._has_bits_[0] &= ~0x00800000u;
+  _impl_._has_bits_[0] &= ~0x01000000u;
 }
 inline const ::anduril::entitymanager::v1::VisualDetails& Entity::_internal_visual_details() const {
   ::google::protobuf::internal::TSanRead(&_impl_);
@@ -7885,16 +7994,16 @@ inline void Entity::unsafe_arena_set_allocated_visual_details(::anduril::entitym
   }
   _impl_.visual_details_ = reinterpret_cast<::anduril::entitymanager::v1::VisualDetails*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00800000u;
+    _impl_._has_bits_[0] |= 0x01000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x00800000u;
+    _impl_._has_bits_[0] &= ~0x01000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.visual_details)
 }
 inline ::anduril::entitymanager::v1::VisualDetails* Entity::release_visual_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x00800000u;
+  _impl_._has_bits_[0] &= ~0x01000000u;
   ::anduril::entitymanager::v1::VisualDetails* released = _impl_.visual_details_;
   _impl_.visual_details_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -7914,7 +8023,7 @@ inline ::anduril::entitymanager::v1::VisualDetails* Entity::unsafe_arena_release
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.visual_details)
 
-  _impl_._has_bits_[0] &= ~0x00800000u;
+  _impl_._has_bits_[0] &= ~0x01000000u;
   ::anduril::entitymanager::v1::VisualDetails* temp = _impl_.visual_details_;
   _impl_.visual_details_ = nullptr;
   return temp;
@@ -7928,7 +8037,7 @@ inline ::anduril::entitymanager::v1::VisualDetails* Entity::_internal_mutable_vi
   return _impl_.visual_details_;
 }
 inline ::anduril::entitymanager::v1::VisualDetails* Entity::mutable_visual_details() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x00800000u;
+  _impl_._has_bits_[0] |= 0x01000000u;
   ::anduril::entitymanager::v1::VisualDetails* _msg = _internal_mutable_visual_details();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.visual_details)
   return _msg;
@@ -7945,9 +8054,9 @@ inline void Entity::set_allocated_visual_details(::anduril::entitymanager::v1::V
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x00800000u;
+    _impl_._has_bits_[0] |= 0x01000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x00800000u;
+    _impl_._has_bits_[0] &= ~0x01000000u;
   }
 
   _impl_.visual_details_ = reinterpret_cast<::anduril::entitymanager::v1::VisualDetails*>(value);
@@ -7956,7 +8065,7 @@ inline void Entity::set_allocated_visual_details(::anduril::entitymanager::v1::V
 
 // .anduril.entitymanager.v1.Dimensions dimensions = 36 [json_name = "dimensions"];
 inline bool Entity::has_dimensions() const {
-  bool value = (_impl_._has_bits_[0] & 0x01000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x02000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.dimensions_ != nullptr);
   return value;
 }
@@ -7976,16 +8085,16 @@ inline void Entity::unsafe_arena_set_allocated_dimensions(::anduril::entitymanag
   }
   _impl_.dimensions_ = reinterpret_cast<::anduril::entitymanager::v1::Dimensions*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x01000000u;
+    _impl_._has_bits_[0] |= 0x02000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x01000000u;
+    _impl_._has_bits_[0] &= ~0x02000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.dimensions)
 }
 inline ::anduril::entitymanager::v1::Dimensions* Entity::release_dimensions() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x01000000u;
+  _impl_._has_bits_[0] &= ~0x02000000u;
   ::anduril::entitymanager::v1::Dimensions* released = _impl_.dimensions_;
   _impl_.dimensions_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8005,7 +8114,7 @@ inline ::anduril::entitymanager::v1::Dimensions* Entity::unsafe_arena_release_di
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.dimensions)
 
-  _impl_._has_bits_[0] &= ~0x01000000u;
+  _impl_._has_bits_[0] &= ~0x02000000u;
   ::anduril::entitymanager::v1::Dimensions* temp = _impl_.dimensions_;
   _impl_.dimensions_ = nullptr;
   return temp;
@@ -8019,7 +8128,7 @@ inline ::anduril::entitymanager::v1::Dimensions* Entity::_internal_mutable_dimen
   return _impl_.dimensions_;
 }
 inline ::anduril::entitymanager::v1::Dimensions* Entity::mutable_dimensions() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x01000000u;
+  _impl_._has_bits_[0] |= 0x02000000u;
   ::anduril::entitymanager::v1::Dimensions* _msg = _internal_mutable_dimensions();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.dimensions)
   return _msg;
@@ -8036,9 +8145,9 @@ inline void Entity::set_allocated_dimensions(::anduril::entitymanager::v1::Dimen
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x01000000u;
+    _impl_._has_bits_[0] |= 0x02000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x01000000u;
+    _impl_._has_bits_[0] &= ~0x02000000u;
   }
 
   _impl_.dimensions_ = reinterpret_cast<::anduril::entitymanager::v1::Dimensions*>(value);
@@ -8047,7 +8156,7 @@ inline void Entity::set_allocated_dimensions(::anduril::entitymanager::v1::Dimen
 
 // .anduril.entitymanager.v1.RouteDetails route_details = 37 [json_name = "routeDetails"];
 inline bool Entity::has_route_details() const {
-  bool value = (_impl_._has_bits_[0] & 0x02000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x04000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.route_details_ != nullptr);
   return value;
 }
@@ -8067,16 +8176,16 @@ inline void Entity::unsafe_arena_set_allocated_route_details(::anduril::entityma
   }
   _impl_.route_details_ = reinterpret_cast<::anduril::entitymanager::v1::RouteDetails*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x02000000u;
+    _impl_._has_bits_[0] |= 0x04000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x02000000u;
+    _impl_._has_bits_[0] &= ~0x04000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.route_details)
 }
 inline ::anduril::entitymanager::v1::RouteDetails* Entity::release_route_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x02000000u;
+  _impl_._has_bits_[0] &= ~0x04000000u;
   ::anduril::entitymanager::v1::RouteDetails* released = _impl_.route_details_;
   _impl_.route_details_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8096,7 +8205,7 @@ inline ::anduril::entitymanager::v1::RouteDetails* Entity::unsafe_arena_release_
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.route_details)
 
-  _impl_._has_bits_[0] &= ~0x02000000u;
+  _impl_._has_bits_[0] &= ~0x04000000u;
   ::anduril::entitymanager::v1::RouteDetails* temp = _impl_.route_details_;
   _impl_.route_details_ = nullptr;
   return temp;
@@ -8110,7 +8219,7 @@ inline ::anduril::entitymanager::v1::RouteDetails* Entity::_internal_mutable_rou
   return _impl_.route_details_;
 }
 inline ::anduril::entitymanager::v1::RouteDetails* Entity::mutable_route_details() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x02000000u;
+  _impl_._has_bits_[0] |= 0x04000000u;
   ::anduril::entitymanager::v1::RouteDetails* _msg = _internal_mutable_route_details();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.route_details)
   return _msg;
@@ -8127,9 +8236,9 @@ inline void Entity::set_allocated_route_details(::anduril::entitymanager::v1::Ro
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x02000000u;
+    _impl_._has_bits_[0] |= 0x04000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x02000000u;
+    _impl_._has_bits_[0] &= ~0x04000000u;
   }
 
   _impl_.route_details_ = reinterpret_cast<::anduril::entitymanager::v1::RouteDetails*>(value);
@@ -8138,7 +8247,7 @@ inline void Entity::set_allocated_route_details(::anduril::entitymanager::v1::Ro
 
 // .anduril.entitymanager.v1.Schedules schedules = 38 [json_name = "schedules"];
 inline bool Entity::has_schedules() const {
-  bool value = (_impl_._has_bits_[0] & 0x04000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x08000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.schedules_ != nullptr);
   return value;
 }
@@ -8158,16 +8267,16 @@ inline void Entity::unsafe_arena_set_allocated_schedules(::anduril::entitymanage
   }
   _impl_.schedules_ = reinterpret_cast<::anduril::entitymanager::v1::Schedules*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x04000000u;
+    _impl_._has_bits_[0] |= 0x08000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x04000000u;
+    _impl_._has_bits_[0] &= ~0x08000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.schedules)
 }
 inline ::anduril::entitymanager::v1::Schedules* Entity::release_schedules() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x04000000u;
+  _impl_._has_bits_[0] &= ~0x08000000u;
   ::anduril::entitymanager::v1::Schedules* released = _impl_.schedules_;
   _impl_.schedules_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8187,7 +8296,7 @@ inline ::anduril::entitymanager::v1::Schedules* Entity::unsafe_arena_release_sch
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.schedules)
 
-  _impl_._has_bits_[0] &= ~0x04000000u;
+  _impl_._has_bits_[0] &= ~0x08000000u;
   ::anduril::entitymanager::v1::Schedules* temp = _impl_.schedules_;
   _impl_.schedules_ = nullptr;
   return temp;
@@ -8201,7 +8310,7 @@ inline ::anduril::entitymanager::v1::Schedules* Entity::_internal_mutable_schedu
   return _impl_.schedules_;
 }
 inline ::anduril::entitymanager::v1::Schedules* Entity::mutable_schedules() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x04000000u;
+  _impl_._has_bits_[0] |= 0x08000000u;
   ::anduril::entitymanager::v1::Schedules* _msg = _internal_mutable_schedules();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.schedules)
   return _msg;
@@ -8218,9 +8327,9 @@ inline void Entity::set_allocated_schedules(::anduril::entitymanager::v1::Schedu
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x04000000u;
+    _impl_._has_bits_[0] |= 0x08000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x04000000u;
+    _impl_._has_bits_[0] &= ~0x08000000u;
   }
 
   _impl_.schedules_ = reinterpret_cast<::anduril::entitymanager::v1::Schedules*>(value);
@@ -8229,7 +8338,7 @@ inline void Entity::set_allocated_schedules(::anduril::entitymanager::v1::Schedu
 
 // .anduril.entitymanager.v1.Health health = 39 [json_name = "health"];
 inline bool Entity::has_health() const {
-  bool value = (_impl_._has_bits_[0] & 0x08000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x10000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.health_ != nullptr);
   return value;
 }
@@ -8249,16 +8358,16 @@ inline void Entity::unsafe_arena_set_allocated_health(::anduril::entitymanager::
   }
   _impl_.health_ = reinterpret_cast<::anduril::entitymanager::v1::Health*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x08000000u;
+    _impl_._has_bits_[0] |= 0x10000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x08000000u;
+    _impl_._has_bits_[0] &= ~0x10000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.health)
 }
 inline ::anduril::entitymanager::v1::Health* Entity::release_health() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x08000000u;
+  _impl_._has_bits_[0] &= ~0x10000000u;
   ::anduril::entitymanager::v1::Health* released = _impl_.health_;
   _impl_.health_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8278,7 +8387,7 @@ inline ::anduril::entitymanager::v1::Health* Entity::unsafe_arena_release_health
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.health)
 
-  _impl_._has_bits_[0] &= ~0x08000000u;
+  _impl_._has_bits_[0] &= ~0x10000000u;
   ::anduril::entitymanager::v1::Health* temp = _impl_.health_;
   _impl_.health_ = nullptr;
   return temp;
@@ -8292,7 +8401,7 @@ inline ::anduril::entitymanager::v1::Health* Entity::_internal_mutable_health()
   return _impl_.health_;
 }
 inline ::anduril::entitymanager::v1::Health* Entity::mutable_health() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x08000000u;
+  _impl_._has_bits_[0] |= 0x10000000u;
   ::anduril::entitymanager::v1::Health* _msg = _internal_mutable_health();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.health)
   return _msg;
@@ -8309,9 +8418,9 @@ inline void Entity::set_allocated_health(::anduril::entitymanager::v1::Health* v
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x08000000u;
+    _impl_._has_bits_[0] |= 0x10000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x08000000u;
+    _impl_._has_bits_[0] &= ~0x10000000u;
   }
 
   _impl_.health_ = reinterpret_cast<::anduril::entitymanager::v1::Health*>(value);
@@ -8320,7 +8429,7 @@ inline void Entity::set_allocated_health(::anduril::entitymanager::v1::Health* v
 
 // .anduril.entitymanager.v1.GroupDetails group_details = 40 [json_name = "groupDetails"];
 inline bool Entity::has_group_details() const {
-  bool value = (_impl_._has_bits_[0] & 0x10000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x20000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.group_details_ != nullptr);
   return value;
 }
@@ -8340,16 +8449,16 @@ inline void Entity::unsafe_arena_set_allocated_group_details(::anduril::entityma
   }
   _impl_.group_details_ = reinterpret_cast<::anduril::entitymanager::v1::GroupDetails*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x10000000u;
+    _impl_._has_bits_[0] |= 0x20000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x10000000u;
+    _impl_._has_bits_[0] &= ~0x20000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.group_details)
 }
 inline ::anduril::entitymanager::v1::GroupDetails* Entity::release_group_details() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x10000000u;
+  _impl_._has_bits_[0] &= ~0x20000000u;
   ::anduril::entitymanager::v1::GroupDetails* released = _impl_.group_details_;
   _impl_.group_details_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8369,7 +8478,7 @@ inline ::anduril::entitymanager::v1::GroupDetails* Entity::unsafe_arena_release_
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.group_details)
 
-  _impl_._has_bits_[0] &= ~0x10000000u;
+  _impl_._has_bits_[0] &= ~0x20000000u;
   ::anduril::entitymanager::v1::GroupDetails* temp = _impl_.group_details_;
   _impl_.group_details_ = nullptr;
   return temp;
@@ -8383,7 +8492,7 @@ inline ::anduril::entitymanager::v1::GroupDetails* Entity::_internal_mutable_gro
   return _impl_.group_details_;
 }
 inline ::anduril::entitymanager::v1::GroupDetails* Entity::mutable_group_details() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x10000000u;
+  _impl_._has_bits_[0] |= 0x20000000u;
   ::anduril::entitymanager::v1::GroupDetails* _msg = _internal_mutable_group_details();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.group_details)
   return _msg;
@@ -8400,9 +8509,9 @@ inline void Entity::set_allocated_group_details(::anduril::entitymanager::v1::Gr
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x10000000u;
+    _impl_._has_bits_[0] |= 0x20000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x10000000u;
+    _impl_._has_bits_[0] &= ~0x20000000u;
   }
 
   _impl_.group_details_ = reinterpret_cast<::anduril::entitymanager::v1::GroupDetails*>(value);
@@ -8411,7 +8520,7 @@ inline void Entity::set_allocated_group_details(::anduril::entitymanager::v1::Gr
 
 // .anduril.entitymanager.v1.Supplies supplies = 42 [json_name = "supplies"];
 inline bool Entity::has_supplies() const {
-  bool value = (_impl_._has_bits_[0] & 0x20000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x40000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.supplies_ != nullptr);
   return value;
 }
@@ -8431,16 +8540,16 @@ inline void Entity::unsafe_arena_set_allocated_supplies(::anduril::entitymanager
   }
   _impl_.supplies_ = reinterpret_cast<::anduril::entitymanager::v1::Supplies*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x20000000u;
+    _impl_._has_bits_[0] |= 0x40000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x20000000u;
+    _impl_._has_bits_[0] &= ~0x40000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.supplies)
 }
 inline ::anduril::entitymanager::v1::Supplies* Entity::release_supplies() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x20000000u;
+  _impl_._has_bits_[0] &= ~0x40000000u;
   ::anduril::entitymanager::v1::Supplies* released = _impl_.supplies_;
   _impl_.supplies_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8460,7 +8569,7 @@ inline ::anduril::entitymanager::v1::Supplies* Entity::unsafe_arena_release_supp
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.supplies)
 
-  _impl_._has_bits_[0] &= ~0x20000000u;
+  _impl_._has_bits_[0] &= ~0x40000000u;
   ::anduril::entitymanager::v1::Supplies* temp = _impl_.supplies_;
   _impl_.supplies_ = nullptr;
   return temp;
@@ -8474,7 +8583,7 @@ inline ::anduril::entitymanager::v1::Supplies* Entity::_internal_mutable_supplie
   return _impl_.supplies_;
 }
 inline ::anduril::entitymanager::v1::Supplies* Entity::mutable_supplies() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x20000000u;
+  _impl_._has_bits_[0] |= 0x40000000u;
   ::anduril::entitymanager::v1::Supplies* _msg = _internal_mutable_supplies();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.supplies)
   return _msg;
@@ -8491,9 +8600,9 @@ inline void Entity::set_allocated_supplies(::anduril::entitymanager::v1::Supplie
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x20000000u;
+    _impl_._has_bits_[0] |= 0x40000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x20000000u;
+    _impl_._has_bits_[0] &= ~0x40000000u;
   }
 
   _impl_.supplies_ = reinterpret_cast<::anduril::entitymanager::v1::Supplies*>(value);
@@ -8502,7 +8611,7 @@ inline void Entity::set_allocated_supplies(::anduril::entitymanager::v1::Supplie
 
 // .anduril.entitymanager.v1.Orbit orbit = 46 [json_name = "orbit"];
 inline bool Entity::has_orbit() const {
-  bool value = (_impl_._has_bits_[0] & 0x40000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x80000000u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.orbit_ != nullptr);
   return value;
 }
@@ -8522,16 +8631,16 @@ inline void Entity::unsafe_arena_set_allocated_orbit(::anduril::entitymanager::v
   }
   _impl_.orbit_ = reinterpret_cast<::anduril::entitymanager::v1::Orbit*>(value);
   if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x40000000u;
+    _impl_._has_bits_[0] |= 0x80000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x40000000u;
+    _impl_._has_bits_[0] &= ~0x80000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:anduril.entitymanager.v1.Entity.orbit)
 }
 inline ::anduril::entitymanager::v1::Orbit* Entity::release_orbit() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
 
-  _impl_._has_bits_[0] &= ~0x40000000u;
+  _impl_._has_bits_[0] &= ~0x80000000u;
   ::anduril::entitymanager::v1::Orbit* released = _impl_.orbit_;
   _impl_.orbit_ = nullptr;
   if (::google::protobuf::internal::DebugHardenForceCopyInRelease()) {
@@ -8551,7 +8660,7 @@ inline ::anduril::entitymanager::v1::Orbit* Entity::unsafe_arena_release_orbit()
   ::google::protobuf::internal::TSanWrite(&_impl_);
   // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.Entity.orbit)
 
-  _impl_._has_bits_[0] &= ~0x40000000u;
+  _impl_._has_bits_[0] &= ~0x80000000u;
   ::anduril::entitymanager::v1::Orbit* temp = _impl_.orbit_;
   _impl_.orbit_ = nullptr;
   return temp;
@@ -8565,7 +8674,7 @@ inline ::anduril::entitymanager::v1::Orbit* Entity::_internal_mutable_orbit() {
   return _impl_.orbit_;
 }
 inline ::anduril::entitymanager::v1::Orbit* Entity::mutable_orbit() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  _impl_._has_bits_[0] |= 0x40000000u;
+  _impl_._has_bits_[0] |= 0x80000000u;
   ::anduril::entitymanager::v1::Orbit* _msg = _internal_mutable_orbit();
   // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.Entity.orbit)
   return _msg;
@@ -8582,9 +8691,9 @@ inline void Entity::set_allocated_orbit(::anduril::entitymanager::v1::Orbit* val
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    _impl_._has_bits_[0] |= 0x40000000u;
+    _impl_._has_bits_[0] |= 0x80000000u;
   } else {
-    _impl_._has_bits_[0] &= ~0x40000000u;
+    _impl_._has_bits_[0] &= ~0x80000000u;
   }
 
   _impl_.orbit_ = reinterpret_cast<::anduril::entitymanager::v1::Orbit*>(value);
diff --git a/src/anduril/entitymanager/v1/media.pub.pb.cc b/src/anduril/entitymanager/v1/media.pub.pb.cc
index 2702a87..63e8d82 100644
--- a/src/anduril/entitymanager/v1/media.pub.pb.cc
+++ b/src/anduril/entitymanager/v1/media.pub.pb.cc
@@ -30,10 +30,7 @@ namespace v1 {
 
 inline constexpr MediaItem::Impl_::Impl_(
     ::_pbi::ConstantInitialized) noexcept
-      : url_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        relative_path_(
+      : relative_path_(
             &::google::protobuf::internal::fixed_address_empty_string,
             ::_pbi::ConstantInitialized()),
         type_{static_cast< ::anduril::entitymanager::v1::MediaType >(0)},
@@ -109,7 +106,6 @@ const ::uint32_t
         ~0u,  // no _inlined_string_donated_
         ~0u,  // no _split_
         ~0u,  // no sizeof(Split)
-        PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::MediaItem, _impl_.url_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::MediaItem, _impl_.type_),
         PROTOBUF_FIELD_OFFSET(::anduril::entitymanager::v1::MediaItem, _impl_.relative_path_),
 };
@@ -129,20 +125,19 @@ const char descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fmedia_2epub_
     "to\022\030anduril.entitymanager.v1\032*anduril/en"
     "titymanager/v1/options.pub.proto\"G\n\005Medi"
     "a\022>\n\005media\030\001 \003(\0132#.anduril.entitymanager"
-    ".v1.MediaItemB\003\310>\001R\005media\"{\n\tMediaItem\022\020"
-    "\n\003url\030\001 \001(\tR\003url\0227\n\004type\030\002 \001(\0162#.anduril"
-    ".entitymanager.v1.MediaTypeR\004type\022#\n\rrel"
-    "ative_path\030\003 \001(\tR\014relativePath*\206\001\n\tMedia"
-    "Type\022\026\n\022MEDIA_TYPE_INVALID\020\000\022\030\n\024MEDIA_TY"
-    "PE_THUMBNAIL\020\001\022\024\n\020MEDIA_TYPE_IMAGE\020\002\022\024\n\020"
-    "MEDIA_TYPE_VIDEO\020\003\022\033\n\027MEDIA_TYPE_SLIPPY_"
-    "TILES\020\004B\376\001\n\034com.anduril.entitymanager.v1"
-    "B\rMediaPubProtoP\001ZMghe.anduril.dev/andur"
-    "il/andurilapis-go/anduril/entitymanager/"
-    "v1;entitymanager\242\002\003AEX\252\002\030Anduril.Entitym"
-    "anager.V1\312\002\030Anduril\\Entitymanager\\V1\342\002$A"
-    "nduril\\Entitymanager\\V1\\GPBMetadata\352\002\032An"
-    "duril::Entitymanager::V1b\006proto3"
+    ".v1.MediaItemB\003\310>\001R\005media\"o\n\tMediaItem\0227"
+    "\n\004type\030\002 \001(\0162#.anduril.entitymanager.v1."
+    "MediaTypeR\004type\022#\n\rrelative_path\030\003 \001(\tR\014"
+    "relativePathJ\004\010\001\020\002*[\n\tMediaType\022\026\n\022MEDIA"
+    "_TYPE_INVALID\020\000\022\024\n\020MEDIA_TYPE_IMAGE\020\002\022\024\n"
+    "\020MEDIA_TYPE_VIDEO\020\003\"\004\010\001\020\001\"\004\010\004\020\004B\376\001\n\034com."
+    "anduril.entitymanager.v1B\rMediaPubProtoP"
+    "\001ZMghe.anduril.dev/anduril/andurilapis-g"
+    "o/anduril/entitymanager/v1;entitymanager"
+    "\242\002\003AEX\252\002\030Anduril.Entitymanager.V1\312\002\030Andu"
+    "ril\\Entitymanager\\V1\342\002$Anduril\\Entityman"
+    "ager\\V1\\GPBMetadata\352\002\032Anduril::Entityman"
+    "ager::V1b\006proto3"
 };
 static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto_deps[1] =
     {
@@ -152,7 +147,7 @@ static ::absl::once_flag descriptor_table_anduril_2fentitymanager_2fv1_2fmedia_2
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto = {
     false,
     false,
-    712,
+    656,
     descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto,
     "anduril/entitymanager/v1/media.pub.proto",
     &descriptor_table_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto_once,
@@ -173,9 +168,9 @@ const ::google::protobuf::EnumDescriptor* MediaType_descriptor() {
   return file_level_enum_descriptors_anduril_2fentitymanager_2fv1_2fmedia_2epub_2eproto[0];
 }
 PROTOBUF_CONSTINIT const uint32_t MediaType_internal_data_[] = {
-    327680u, 0u, };
+    65536u, 32u, 6u, };
 bool MediaType_IsValid(int value) {
-  return 0 <= value && value <= 4;
+  return 0 <= value && value <= 3 && ((13u >> value) & 1) != 0;
 }
 // ===================================================================
 
@@ -437,8 +432,7 @@ MediaItem::MediaItem(::google::protobuf::Arena* arena)
 inline PROTOBUF_NDEBUG_INLINE MediaItem::Impl_::Impl_(
     ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
     const Impl_& from, const ::anduril::entitymanager::v1::MediaItem& from_msg)
-      : url_(arena, from.url_),
-        relative_path_(arena, from.relative_path_),
+      : relative_path_(arena, from.relative_path_),
         _cached_size_{0} {}
 
 MediaItem::MediaItem(
@@ -461,8 +455,7 @@ MediaItem::MediaItem(
 inline PROTOBUF_NDEBUG_INLINE MediaItem::Impl_::Impl_(
     ::google::protobuf::internal::InternalVisibility visibility,
     ::google::protobuf::Arena* arena)
-      : url_(arena),
-        relative_path_(arena),
+      : relative_path_(arena),
         _cached_size_{0} {}
 
 inline void MediaItem::SharedCtor(::_pb::Arena* arena) {
@@ -477,7 +470,6 @@ inline void MediaItem::SharedDtor(MessageLite& self) {
   MediaItem& this_ = static_cast<MediaItem&>(self);
   this_._internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   ABSL_DCHECK(this_.GetArena() == nullptr);
-  this_._impl_.url_.Destroy();
   this_._impl_.relative_path_.Destroy();
   this_._impl_.~Impl_();
 }
@@ -518,15 +510,15 @@ const ::google::protobuf::internal::ClassData* MediaItem::GetClassData() const {
   return _class_data_.base();
 }
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 59, 2> MediaItem::_table_ = {
+const ::_pbi::TcParseTable<1, 2, 0, 56, 2> MediaItem::_table_ = {
   {
     0,  // no _has_bits_
     0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
+    3, 8,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
+    4294967289,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
+    2,  // num_field_entries
     0,  // num_aux_entries
     offsetof(decltype(_table_), field_names),  // no aux_entries
     _class_data_.base(),
@@ -536,10 +528,6 @@ const ::_pbi::TcParseTable<2, 3, 0, 59, 2> MediaItem::_table_ = {
     ::_pbi::TcParser::GetTable<::anduril::entitymanager::v1::MediaItem>(),  // to_prefetch
     #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string url = 1 [json_name = "url"];
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(MediaItem, _impl_.url_)}},
     // .anduril.entitymanager.v1.MediaType type = 2 [json_name = "type"];
     {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(MediaItem, _impl_.type_), 63>(),
      {16, 63, 0, PROTOBUF_FIELD_OFFSET(MediaItem, _impl_.type_)}},
@@ -549,9 +537,6 @@ const ::_pbi::TcParseTable<2, 3, 0, 59, 2> MediaItem::_table_ = {
   }}, {{
     65535, 65535
   }}, {{
-    // string url = 1 [json_name = "url"];
-    {PROTOBUF_FIELD_OFFSET(MediaItem, _impl_.url_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
     // .anduril.entitymanager.v1.MediaType type = 2 [json_name = "type"];
     {PROTOBUF_FIELD_OFFSET(MediaItem, _impl_.type_), 0, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
@@ -561,9 +546,8 @@ const ::_pbi::TcParseTable<2, 3, 0, 59, 2> MediaItem::_table_ = {
   }},
   // no aux_entries
   {{
-    "\42\3\0\15\0\0\0\0"
+    "\42\0\15\0\0\0\0\0"
     "anduril.entitymanager.v1.MediaItem"
-    "url"
     "relative_path"
   }},
 };
@@ -575,7 +559,6 @@ PROTOBUF_NOINLINE void MediaItem::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  _impl_.url_.ClearToEmpty();
   _impl_.relative_path_.ClearToEmpty();
   _impl_.type_ = 0;
   _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
@@ -596,14 +579,6 @@ PROTOBUF_NOINLINE void MediaItem::Clear() {
           ::uint32_t cached_has_bits = 0;
           (void)cached_has_bits;
 
-          // string url = 1 [json_name = "url"];
-          if (!this_._internal_url().empty()) {
-            const std::string& _s = this_._internal_url();
-            ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-                _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "anduril.entitymanager.v1.MediaItem.url");
-            target = stream->WriteStringMaybeAliased(1, _s, target);
-          }
-
           // .anduril.entitymanager.v1.MediaType type = 2 [json_name = "type"];
           if (this_._internal_type() != 0) {
             target = stream->EnsureSpace(target);
@@ -644,11 +619,6 @@ PROTOBUF_NOINLINE void MediaItem::Clear() {
 
           ::_pbi::Prefetch5LinesFrom7Lines(&this_);
            {
-            // string url = 1 [json_name = "url"];
-            if (!this_._internal_url().empty()) {
-              total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                              this_._internal_url());
-            }
             // string relative_path = 3 [json_name = "relativePath"];
             if (!this_._internal_relative_path().empty()) {
               total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
@@ -672,9 +642,6 @@ void MediaItem::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::googl
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  if (!from._internal_url().empty()) {
-    _this->_internal_set_url(from._internal_url());
-  }
   if (!from._internal_relative_path().empty()) {
     _this->_internal_set_relative_path(from._internal_relative_path());
   }
@@ -697,7 +664,6 @@ void MediaItem::InternalSwap(MediaItem* PROTOBUF_RESTRICT other) {
   auto* arena = GetArena();
   ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.url_, &other->_impl_.url_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.relative_path_, &other->_impl_.relative_path_, arena);
   swap(_impl_.type_, other->_impl_.type_);
 }
diff --git a/src/anduril/entitymanager/v1/media.pub.pb.h b/src/anduril/entitymanager/v1/media.pub.pb.h
index 7ba9e05..6ed8d6c 100644
--- a/src/anduril/entitymanager/v1/media.pub.pb.h
+++ b/src/anduril/entitymanager/v1/media.pub.pb.h
@@ -75,10 +75,8 @@ namespace entitymanager {
 namespace v1 {
 enum MediaType : int {
   MEDIA_TYPE_INVALID = 0,
-  MEDIA_TYPE_THUMBNAIL = 1,
   MEDIA_TYPE_IMAGE = 2,
   MEDIA_TYPE_VIDEO = 3,
-  MEDIA_TYPE_SLIPPY_TILES = 4,
   MediaType_INT_MIN_SENTINEL_DO_NOT_USE_ =
       std::numeric_limits<::int32_t>::min(),
   MediaType_INT_MAX_SENTINEL_DO_NOT_USE_ =
@@ -88,8 +86,8 @@ enum MediaType : int {
 bool MediaType_IsValid(int value);
 extern const uint32_t MediaType_internal_data_[];
 constexpr MediaType MediaType_MIN = static_cast<MediaType>(0);
-constexpr MediaType MediaType_MAX = static_cast<MediaType>(4);
-constexpr int MediaType_ARRAYSIZE = 4 + 1;
+constexpr MediaType MediaType_MAX = static_cast<MediaType>(3);
+constexpr int MediaType_ARRAYSIZE = 3 + 1;
 const ::google::protobuf::EnumDescriptor*
 MediaType_descriptor();
 template <typename T>
@@ -102,7 +100,7 @@ const std::string& MediaType_Name(T value) {
 template <>
 inline const std::string& MediaType_Name(MediaType value) {
   return ::google::protobuf::internal::NameOfDenseEnum<MediaType_descriptor,
-                                                 0, 4>(
+                                                 0, 3>(
       static_cast<int>(value));
 }
 inline bool MediaType_Parse(absl::string_view name, MediaType* value) {
@@ -262,26 +260,9 @@ class MediaItem final
 
   // accessors -------------------------------------------------------
   enum : int {
-    kUrlFieldNumber = 1,
     kRelativePathFieldNumber = 3,
     kTypeFieldNumber = 2,
   };
-  // string url = 1 [json_name = "url"];
-  void clear_url() ;
-  const std::string& url() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_url(Arg_&& arg, Args_... args);
-  std::string* mutable_url();
-  PROTOBUF_NODISCARD std::string* release_url();
-  void set_allocated_url(std::string* value);
-
-  private:
-  const std::string& _internal_url() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_url(
-      const std::string& value);
-  std::string* _internal_mutable_url();
-
-  public:
   // string relative_path = 3 [json_name = "relativePath"];
   void clear_relative_path() ;
   const std::string& relative_path() const;
@@ -313,8 +294,8 @@ class MediaItem final
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      59, 2>
+      1, 2, 0,
+      56, 2>
       _table_;
 
   friend class ::google::protobuf::MessageLite;
@@ -331,7 +312,6 @@ class MediaItem final
     inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
                           ::google::protobuf::Arena* arena, const Impl_& from,
                           const MediaItem& from_msg);
-    ::google::protobuf::internal::ArenaStringPtr url_;
     ::google::protobuf::internal::ArenaStringPtr relative_path_;
     int type_;
     ::google::protobuf::internal::CachedSize _cached_size_;
@@ -608,54 +588,6 @@ Media::_internal_mutable_media() {
 
 // MediaItem
 
-// string url = 1 [json_name = "url"];
-inline void MediaItem::clear_url() {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  _impl_.url_.ClearToEmpty();
-}
-inline const std::string& MediaItem::url() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:anduril.entitymanager.v1.MediaItem.url)
-  return _internal_url();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MediaItem::set_url(Arg_&& arg,
-                                                     Args_... args) {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  _impl_.url_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:anduril.entitymanager.v1.MediaItem.url)
-}
-inline std::string* MediaItem::mutable_url() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_url();
-  // @@protoc_insertion_point(field_mutable:anduril.entitymanager.v1.MediaItem.url)
-  return _s;
-}
-inline const std::string& MediaItem::_internal_url() const {
-  ::google::protobuf::internal::TSanRead(&_impl_);
-  return _impl_.url_.Get();
-}
-inline void MediaItem::_internal_set_url(const std::string& value) {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  _impl_.url_.Set(value, GetArena());
-}
-inline std::string* MediaItem::_internal_mutable_url() {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  return _impl_.url_.Mutable( GetArena());
-}
-inline std::string* MediaItem::release_url() {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  // @@protoc_insertion_point(field_release:anduril.entitymanager.v1.MediaItem.url)
-  return _impl_.url_.Release();
-}
-inline void MediaItem::set_allocated_url(std::string* value) {
-  ::google::protobuf::internal::TSanWrite(&_impl_);
-  _impl_.url_.SetAllocated(value, GetArena());
-  if (::google::protobuf::internal::DebugHardenForceCopyDefaultString() && _impl_.url_.IsDefault()) {
-    _impl_.url_.Set("", GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:anduril.entitymanager.v1.MediaItem.url)
-}
-
 // .anduril.entitymanager.v1.MediaType type = 2 [json_name = "type"];
 inline void MediaItem::clear_type() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
diff --git a/src/anduril/entitymanager/v1/signal.pub.pb.cc b/src/anduril/entitymanager/v1/signal.pub.pb.cc
index 48a11dd..6294162 100644
--- a/src/anduril/entitymanager/v1/signal.pub.pb.cc
+++ b/src/anduril/entitymanager/v1/signal.pub.pb.cc
@@ -459,86 +459,89 @@ static const ::_pb::Message* const file_default_instances[] = {
 const char descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
     protodesc_cold) = {
     "\n)anduril/entitymanager/v1/signal.pub.pr"
-    "oto\022\030anduril.entitymanager.v1\032\035anduril/t"
-    "ype/coords.pub.proto\032\036google/protobuf/wr"
-    "appers.proto\"\341\006\n\006Signal\022P\n\020frequency_cen"
-    "ter\030\001 \001(\0132#.anduril.entitymanager.v1.Fre"
-    "quencyH\000R\017frequencyCenter\022S\n\017frequency_r"
-    "ange\030\002 \001(\0132(.anduril.entitymanager.v1.Fr"
-    "equencyRangeH\000R\016frequencyRange\022\?\n\014bandwi"
-    "dth_hz\030\003 \001(\0132\034.google.protobuf.DoubleVal"
-    "ueR\013bandwidthHz\022O\n\025signal_to_noise_ratio"
-    "\030\004 \001(\0132\034.google.protobuf.DoubleValueR\022si"
-    "gnalToNoiseRatio\022Q\n\017line_of_bearing\030\005 \001("
-    "\0132\'.anduril.entitymanager.v1.LineOfBeari"
-    "ngH\001R\rlineOfBearing\0227\n\005fixed\030\006 \001(\0132\037.and"
-    "uril.entitymanager.v1.FixedH\001R\005fixed\022V\n\021"
-    "emitter_notations\030\007 \003(\0132).anduril.entity"
-    "manager.v1.EmitterNotationR\020emitterNotat"
-    "ions\022@\n\rpulse_width_s\030\010 \001(\0132\034.google.pro"
-    "tobuf.DoubleValueR\013pulseWidthS\022m\n\031pulse_"
-    "repetition_interval\030\t \001(\01321.anduril.enti"
-    "tymanager.v1.PulseRepetitionIntervalR\027pu"
-    "lseRepetitionInterval\022`\n\024scan_characteri"
-    "stics\030\013 \001(\0132-.anduril.entitymanager.v1.S"
-    "canCharacteristicsR\023scanCharacteristicsB"
-    "\027\n\025frequency_measurementB\010\n\006reportJ\004\010\n\020\013"
-    "\"z\n\017EmitterNotation\022)\n\020emitter_notation\030"
-    "\001 \001(\tR\017emitterNotation\022<\n\nconfidence\030\002 \001"
-    "(\0132\034.google.protobuf.DoubleValueR\nconfid"
-    "ence\"u\n\013Measurement\0222\n\005value\030\001 \001(\0132\034.goo"
-    "gle.protobuf.DoubleValueR\005value\0222\n\005sigma"
-    "\030\002 \001(\0132\034.google.protobuf.DoubleValueR\005si"
-    "gma\"U\n\tFrequency\022H\n\014frequency_hz\030\001 \001(\0132%"
-    ".anduril.entitymanager.v1.MeasurementR\013f"
-    "requencyHz\"\276\001\n\016FrequencyRange\022U\n\024minimum"
-    "_frequency_hz\030\001 \001(\0132#.anduril.entitymana"
-    "ger.v1.FrequencyR\022minimumFrequencyHz\022U\n\024"
-    "maximum_frequency_hz\030\002 \001(\0132#.anduril.ent"
-    "itymanager.v1.FrequencyR\022maximumFrequenc"
-    "yHz\"\236\002\n\rLineOfBearing\022R\n\020angle_of_arriva"
-    "l\030\003 \001(\0132(.anduril.entitymanager.v1.Angle"
-    "OfArrivalR\016angleOfArrival\022Q\n\020range_estim"
-    "ate_m\030\004 \001(\0132%.anduril.entitymanager.v1.M"
-    "easurementH\000R\016rangeEstimateM\022G\n\013max_rang"
-    "e_m\030\005 \001(\0132%.anduril.entitymanager.v1.Mea"
-    "surementH\000R\tmaxRangeMB\021\n\017detection_range"
-    "J\004\010\001\020\002J\004\010\002\020\003\"\251\001\n\016AngleOfArrival\0227\n\rrelat"
-    "ive_pose\030\001 \001(\0132\022.anduril.type.PoseR\014rela"
-    "tivePose\022^\n!bearing_elevation_covariance"
-    "_rad2\030\002 \001(\0132\023.anduril.type.TMat2R\036bearin"
-    "gElevationCovarianceRad2\"\007\n\005Fixed\"\177\n\027Pul"
-    "seRepetitionInterval\022d\n\033pulse_repetition"
-    "_interval_s\030\001 \001(\0132%.anduril.entitymanage"
-    "r.v1.MeasurementR\030pulseRepetitionInterva"
-    "lS\"\230\001\n\023ScanCharacteristics\022\?\n\tscan_type\030"
-    "\001 \001(\0162\".anduril.entitymanager.v1.ScanTyp"
-    "eR\010scanType\022@\n\rscan_period_s\030\002 \001(\0132\034.goo"
-    "gle.protobuf.DoubleValueR\013scanPeriodS*\274\004"
-    "\n\010ScanType\022\025\n\021SCAN_TYPE_INVALID\020\000\022\026\n\022SCA"
-    "N_TYPE_CIRCULAR\020\001\022-\n)SCAN_TYPE_BIDIRECTI"
-    "ONAL_HORIZONTAL_SECTOR\020\002\022+\n\'SCAN_TYPE_BI"
-    "DIRECTIONAL_VERTICAL_SECTOR\020\003\022\032\n\026SCAN_TY"
-    "PE_NON_SCANNING\020\004\022\027\n\023SCAN_TYPE_IRREGULAR"
-    "\020\005\022\025\n\021SCAN_TYPE_CONICAL\020\006\022\034\n\030SCAN_TYPE_L"
-    "OBE_SWITCHING\020\007\022\024\n\020SCAN_TYPE_RASTER\020\010\022&\n"
-    "\"SCAN_TYPE_CIRCULAR_VERTICAL_SECTOR\020\t\022\036\n"
-    "\032SCAN_TYPE_CIRCULAR_CONICAL\020\n\022\034\n\030SCAN_TY"
-    "PE_SECTOR_CONICAL\020\013\022\030\n\024SCAN_TYPE_AGILE_B"
-    "EAM\020\014\022,\n(SCAN_TYPE_UNIDIRECTIONAL_VERTIC"
-    "AL_SECTOR\020\r\022.\n*SCAN_TYPE_UNIDIRECTIONAL_"
-    "HORIZONTAL_SECTOR\020\016\022#\n\037SCAN_TYPE_UNIDIRE"
-    "CTIONAL_SECTOR\020\017\022\"\n\036SCAN_TYPE_BIDIRECTIO"
-    "NAL_SECTOR\020\020B\377\001\n\034com.anduril.entitymanag"
-    "er.v1B\016SignalPubProtoP\001ZMghe.anduril.dev"
-    "/anduril/andurilapis-go/anduril/entityma"
-    "nager/v1;entitymanager\242\002\003AEX\252\002\030Anduril.E"
-    "ntitymanager.V1\312\002\030Anduril\\Entitymanager\\"
-    "V1\342\002$Anduril\\Entitymanager\\V1\\GPBMetadat"
-    "a\352\002\032Anduril::Entitymanager::V1b\006proto3"
+    "oto\022\030anduril.entitymanager.v1\032*anduril/e"
+    "ntitymanager/v1/options.pub.proto\032\035andur"
+    "il/type/coords.pub.proto\032\036google/protobu"
+    "f/wrappers.proto\"\377\006\n\006Signal\022U\n\020frequency"
+    "_center\030\001 \001(\0132#.anduril.entitymanager.v1"
+    ".FrequencyB\003\310>\001H\000R\017frequencyCenter\022X\n\017fr"
+    "equency_range\030\002 \001(\0132(.anduril.entitymana"
+    "ger.v1.FrequencyRangeB\003\310>\001H\000R\016frequencyR"
+    "ange\022D\n\014bandwidth_hz\030\003 \001(\0132\034.google.prot"
+    "obuf.DoubleValueB\003\310>\001R\013bandwidthHz\022O\n\025si"
+    "gnal_to_noise_ratio\030\004 \001(\0132\034.google.proto"
+    "buf.DoubleValueR\022signalToNoiseRatio\022Q\n\017l"
+    "ine_of_bearing\030\005 \001(\0132\'.anduril.entityman"
+    "ager.v1.LineOfBearingH\001R\rlineOfBearing\0227"
+    "\n\005fixed\030\006 \001(\0132\037.anduril.entitymanager.v1"
+    ".FixedH\001R\005fixed\022[\n\021emitter_notations\030\007 \003"
+    "(\0132).anduril.entitymanager.v1.EmitterNot"
+    "ationB\003\310>\001R\020emitterNotations\022E\n\rpulse_wi"
+    "dth_s\030\010 \001(\0132\034.google.protobuf.DoubleValu"
+    "eB\003\310>\001R\013pulseWidthS\022r\n\031pulse_repetition_"
+    "interval\030\t \001(\01321.anduril.entitymanager.v"
+    "1.PulseRepetitionIntervalB\003\310>\001R\027pulseRep"
+    "etitionInterval\022`\n\024scan_characteristics\030"
+    "\013 \001(\0132-.anduril.entitymanager.v1.ScanCha"
+    "racteristicsR\023scanCharacteristicsB\027\n\025fre"
+    "quency_measurementB\010\n\006reportJ\004\010\n\020\013\"z\n\017Em"
+    "itterNotation\022)\n\020emitter_notation\030\001 \001(\tR"
+    "\017emitterNotation\022<\n\nconfidence\030\002 \001(\0132\034.g"
+    "oogle.protobuf.DoubleValueR\nconfidence\"u"
+    "\n\013Measurement\0222\n\005value\030\001 \001(\0132\034.google.pr"
+    "otobuf.DoubleValueR\005value\0222\n\005sigma\030\002 \001(\013"
+    "2\034.google.protobuf.DoubleValueR\005sigma\"U\n"
+    "\tFrequency\022H\n\014frequency_hz\030\001 \001(\0132%.andur"
+    "il.entitymanager.v1.MeasurementR\013frequen"
+    "cyHz\"\276\001\n\016FrequencyRange\022U\n\024minimum_frequ"
+    "ency_hz\030\001 \001(\0132#.anduril.entitymanager.v1"
+    ".FrequencyR\022minimumFrequencyHz\022U\n\024maximu"
+    "m_frequency_hz\030\002 \001(\0132#.anduril.entityman"
+    "ager.v1.FrequencyR\022maximumFrequencyHz\"\236\002"
+    "\n\rLineOfBearing\022R\n\020angle_of_arrival\030\003 \001("
+    "\0132(.anduril.entitymanager.v1.AngleOfArri"
+    "valR\016angleOfArrival\022Q\n\020range_estimate_m\030"
+    "\004 \001(\0132%.anduril.entitymanager.v1.Measure"
+    "mentH\000R\016rangeEstimateM\022G\n\013max_range_m\030\005 "
+    "\001(\0132%.anduril.entitymanager.v1.Measureme"
+    "ntH\000R\tmaxRangeMB\021\n\017detection_rangeJ\004\010\001\020\002"
+    "J\004\010\002\020\003\"\251\001\n\016AngleOfArrival\0227\n\rrelative_po"
+    "se\030\001 \001(\0132\022.anduril.type.PoseR\014relativePo"
+    "se\022^\n!bearing_elevation_covariance_rad2\030"
+    "\002 \001(\0132\023.anduril.type.TMat2R\036bearingEleva"
+    "tionCovarianceRad2\"\007\n\005Fixed\"\177\n\027PulseRepe"
+    "titionInterval\022d\n\033pulse_repetition_inter"
+    "val_s\030\001 \001(\0132%.anduril.entitymanager.v1.M"
+    "easurementR\030pulseRepetitionIntervalS\"\230\001\n"
+    "\023ScanCharacteristics\022\?\n\tscan_type\030\001 \001(\0162"
+    "\".anduril.entitymanager.v1.ScanTypeR\010sca"
+    "nType\022@\n\rscan_period_s\030\002 \001(\0132\034.google.pr"
+    "otobuf.DoubleValueR\013scanPeriodS*\274\004\n\010Scan"
+    "Type\022\025\n\021SCAN_TYPE_INVALID\020\000\022\026\n\022SCAN_TYPE"
+    "_CIRCULAR\020\001\022-\n)SCAN_TYPE_BIDIRECTIONAL_H"
+    "ORIZONTAL_SECTOR\020\002\022+\n\'SCAN_TYPE_BIDIRECT"
+    "IONAL_VERTICAL_SECTOR\020\003\022\032\n\026SCAN_TYPE_NON"
+    "_SCANNING\020\004\022\027\n\023SCAN_TYPE_IRREGULAR\020\005\022\025\n\021"
+    "SCAN_TYPE_CONICAL\020\006\022\034\n\030SCAN_TYPE_LOBE_SW"
+    "ITCHING\020\007\022\024\n\020SCAN_TYPE_RASTER\020\010\022&\n\"SCAN_"
+    "TYPE_CIRCULAR_VERTICAL_SECTOR\020\t\022\036\n\032SCAN_"
+    "TYPE_CIRCULAR_CONICAL\020\n\022\034\n\030SCAN_TYPE_SEC"
+    "TOR_CONICAL\020\013\022\030\n\024SCAN_TYPE_AGILE_BEAM\020\014\022"
+    ",\n(SCAN_TYPE_UNIDIRECTIONAL_VERTICAL_SEC"
+    "TOR\020\r\022.\n*SCAN_TYPE_UNIDIRECTIONAL_HORIZO"
+    "NTAL_SECTOR\020\016\022#\n\037SCAN_TYPE_UNIDIRECTIONA"
+    "L_SECTOR\020\017\022\"\n\036SCAN_TYPE_BIDIRECTIONAL_SE"
+    "CTOR\020\020B\377\001\n\034com.anduril.entitymanager.v1B"
+    "\016SignalPubProtoP\001ZMghe.anduril.dev/andur"
+    "il/andurilapis-go/anduril/entitymanager/"
+    "v1;entitymanager\242\002\003AEX\252\002\030Anduril.Entitym"
+    "anager.V1\312\002\030Anduril\\Entitymanager\\V1\342\002$A"
+    "nduril\\Entitymanager\\V1\\GPBMetadata\352\002\032An"
+    "duril::Entitymanager::V1b\006proto3"
 };
-static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto_deps[2] =
+static const ::_pbi::DescriptorTable* const descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto_deps[3] =
     {
+        &::descriptor_table_anduril_2fentitymanager_2fv1_2foptions_2epub_2eproto,
         &::descriptor_table_anduril_2ftype_2fcoords_2epub_2eproto,
         &::descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
 };
@@ -546,12 +549,12 @@ static ::absl::once_flag descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto = {
     false,
     false,
-    3118,
+    3192,
     descriptor_table_protodef_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto,
     "anduril/entitymanager/v1/signal.pub.proto",
     &descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto_once,
     descriptor_table_anduril_2fentitymanager_2fv1_2fsignal_2epub_2eproto_deps,
-    2,
+    3,
     10,
     schemas,
     file_default_instances,
@@ -885,7 +888,7 @@ const ::_pbi::TcParseTable<4, 10, 10, 0, 2> Signal::_table_ = {
     {::_pbi::TcParser::MiniParse, {}},
     {::_pbi::TcParser::MiniParse, {}},
     {::_pbi::TcParser::MiniParse, {}},
-    // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+    // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
     {::_pbi::TcParser::FastMtS1,
      {26, 0, 2, PROTOBUF_FIELD_OFFSET(Signal, _impl_.bandwidth_hz_)}},
     // .google.protobuf.DoubleValue signal_to_noise_ratio = 4 [json_name = "signalToNoiseRatio"];
@@ -893,13 +896,13 @@ const ::_pbi::TcParseTable<4, 10, 10, 0, 2> Signal::_table_ = {
      {34, 1, 3, PROTOBUF_FIELD_OFFSET(Signal, _impl_.signal_to_noise_ratio_)}},
     {::_pbi::TcParser::MiniParse, {}},
     {::_pbi::TcParser::MiniParse, {}},
-    // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+    // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
     {::_pbi::TcParser::FastMtR1,
      {58, 63, 6, PROTOBUF_FIELD_OFFSET(Signal, _impl_.emitter_notations_)}},
-    // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+    // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
     {::_pbi::TcParser::FastMtS1,
      {66, 2, 7, PROTOBUF_FIELD_OFFSET(Signal, _impl_.pulse_width_s_)}},
-    // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+    // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
     {::_pbi::TcParser::FastMtS1,
      {74, 3, 8, PROTOBUF_FIELD_OFFSET(Signal, _impl_.pulse_repetition_interval_)}},
     {::_pbi::TcParser::MiniParse, {}},
@@ -913,13 +916,13 @@ const ::_pbi::TcParseTable<4, 10, 10, 0, 2> Signal::_table_ = {
   }}, {{
     65535, 65535
   }}, {{
-    // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter"];
+    // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.frequency_measurement_.frequency_center_), _Internal::kOneofCaseOffset + 0, 0,
     (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange"];
+    // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.frequency_measurement_.frequency_range_), _Internal::kOneofCaseOffset + 0, 1,
     (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+    // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.bandwidth_hz_), _Internal::kHasBitsOffset + 0, 2,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .google.protobuf.DoubleValue signal_to_noise_ratio = 4 [json_name = "signalToNoiseRatio"];
@@ -931,13 +934,13 @@ const ::_pbi::TcParseTable<4, 10, 10, 0, 2> Signal::_table_ = {
     // .anduril.entitymanager.v1.Fixed fixed = 6 [json_name = "fixed"];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.report_.fixed_), _Internal::kOneofCaseOffset + 4, 5,
     (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+    // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.emitter_notations_), -1, 6,
     (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+    // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.pulse_width_s_), _Internal::kHasBitsOffset + 2, 7,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+    // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
     {PROTOBUF_FIELD_OFFSET(Signal, _impl_.pulse_repetition_interval_), _Internal::kHasBitsOffset + 3, 8,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
     // .anduril.entitymanager.v1.ScanCharacteristics scan_characteristics = 11 [json_name = "scanCharacteristics"];
@@ -1027,7 +1030,7 @@ PROTOBUF_NOINLINE void Signal::Clear() {
               break;
           }
           cached_has_bits = this_._impl_._has_bits_[0];
-          // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+          // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
           if (cached_has_bits & 0x00000001u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 3, *this_._impl_.bandwidth_hz_, this_._impl_.bandwidth_hz_->GetCachedSize(), target,
@@ -1057,7 +1060,7 @@ PROTOBUF_NOINLINE void Signal::Clear() {
             default:
               break;
           }
-          // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+          // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
           for (unsigned i = 0, n = static_cast<unsigned>(
                                    this_._internal_emitter_notations_size());
                i < n; i++) {
@@ -1068,14 +1071,14 @@ PROTOBUF_NOINLINE void Signal::Clear() {
                     target, stream);
           }
 
-          // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+          // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
           if (cached_has_bits & 0x00000004u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 8, *this_._impl_.pulse_width_s_, this_._impl_.pulse_width_s_->GetCachedSize(), target,
                 stream);
           }
 
-          // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+          // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
           if (cached_has_bits & 0x00000008u) {
             target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
                 9, *this_._impl_.pulse_repetition_interval_, this_._impl_.pulse_repetition_interval_->GetCachedSize(), target,
@@ -1114,7 +1117,7 @@ PROTOBUF_NOINLINE void Signal::Clear() {
 
           ::_pbi::Prefetch5LinesFrom7Lines(&this_);
            {
-            // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+            // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
             {
               total_size += 1UL * this_._internal_emitter_notations_size();
               for (const auto& msg : this_._internal_emitter_notations()) {
@@ -1124,7 +1127,7 @@ PROTOBUF_NOINLINE void Signal::Clear() {
           }
           cached_has_bits = this_._impl_._has_bits_[0];
           if (cached_has_bits & 0x0000001fu) {
-            // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+            // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
             if (cached_has_bits & 0x00000001u) {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.bandwidth_hz_);
@@ -1134,12 +1137,12 @@ PROTOBUF_NOINLINE void Signal::Clear() {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.signal_to_noise_ratio_);
             }
-            // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+            // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
             if (cached_has_bits & 0x00000004u) {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.pulse_width_s_);
             }
-            // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+            // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
             if (cached_has_bits & 0x00000008u) {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.pulse_repetition_interval_);
@@ -1151,13 +1154,13 @@ PROTOBUF_NOINLINE void Signal::Clear() {
             }
           }
           switch (this_.frequency_measurement_case()) {
-            // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter"];
+            // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter", (.anduril.entitymanager.v1.overridable) = true];
             case kFrequencyCenter: {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.frequency_measurement_.frequency_center_);
               break;
             }
-            // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange"];
+            // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange", (.anduril.entitymanager.v1.overridable) = true];
             case kFrequencyRange: {
               total_size += 1 +
                             ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.frequency_measurement_.frequency_range_);
diff --git a/src/anduril/entitymanager/v1/signal.pub.pb.h b/src/anduril/entitymanager/v1/signal.pub.pb.h
index 299faa5..f2954f5 100644
--- a/src/anduril/entitymanager/v1/signal.pub.pb.h
+++ b/src/anduril/entitymanager/v1/signal.pub.pb.h
@@ -31,6 +31,7 @@
 #include "google/protobuf/extension_set.h"  // IWYU pragma: export
 #include "google/protobuf/generated_enum_reflection.h"
 #include "google/protobuf/unknown_field_set.h"
+#include "anduril/entitymanager/v1/options.pub.pb.h"
 #include "anduril/type/coords.pub.pb.h"
 #include "google/protobuf/wrappers.pb.h"
 // @@protoc_insertion_point(includes)
@@ -2182,7 +2183,7 @@ class Signal final
     kLineOfBearingFieldNumber = 5,
     kFixedFieldNumber = 6,
   };
-  // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+  // repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
   int emitter_notations_size() const;
   private:
   int _internal_emitter_notations_size() const;
@@ -2199,7 +2200,7 @@ class Signal final
   const ::anduril::entitymanager::v1::EmitterNotation& emitter_notations(int index) const;
   ::anduril::entitymanager::v1::EmitterNotation* add_emitter_notations();
   const ::google::protobuf::RepeatedPtrField<::anduril::entitymanager::v1::EmitterNotation>& emitter_notations() const;
-  // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+  // .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
   bool has_bandwidth_hz() const;
   void clear_bandwidth_hz() ;
   const ::google::protobuf::DoubleValue& bandwidth_hz() const;
@@ -2229,7 +2230,7 @@ class Signal final
   ::google::protobuf::DoubleValue* _internal_mutable_signal_to_noise_ratio();
 
   public:
-  // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+  // .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
   bool has_pulse_width_s() const;
   void clear_pulse_width_s() ;
   const ::google::protobuf::DoubleValue& pulse_width_s() const;
@@ -2244,7 +2245,7 @@ class Signal final
   ::google::protobuf::DoubleValue* _internal_mutable_pulse_width_s();
 
   public:
-  // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+  // .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
   bool has_pulse_repetition_interval() const;
   void clear_pulse_repetition_interval() ;
   const ::anduril::entitymanager::v1::PulseRepetitionInterval& pulse_repetition_interval() const;
@@ -2274,7 +2275,7 @@ class Signal final
   ::anduril::entitymanager::v1::ScanCharacteristics* _internal_mutable_scan_characteristics();
 
   public:
-  // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter"];
+  // .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter", (.anduril.entitymanager.v1.overridable) = true];
   bool has_frequency_center() const;
   private:
   bool _internal_has_frequency_center() const;
@@ -2293,7 +2294,7 @@ class Signal final
   ::anduril::entitymanager::v1::Frequency* _internal_mutable_frequency_center();
 
   public:
-  // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange"];
+  // .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange", (.anduril.entitymanager.v1.overridable) = true];
   bool has_frequency_range() const;
   private:
   bool _internal_has_frequency_range() const;
@@ -2428,7 +2429,7 @@ class Signal final
 
 // Signal
 
-// .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter"];
+// .anduril.entitymanager.v1.Frequency frequency_center = 1 [json_name = "frequencyCenter", (.anduril.entitymanager.v1.overridable) = true];
 inline bool Signal::has_frequency_center() const {
   return frequency_measurement_case() == kFrequencyCenter;
 }
@@ -2507,7 +2508,7 @@ inline ::anduril::entitymanager::v1::Frequency* Signal::mutable_frequency_center
   return _msg;
 }
 
-// .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange"];
+// .anduril.entitymanager.v1.FrequencyRange frequency_range = 2 [json_name = "frequencyRange", (.anduril.entitymanager.v1.overridable) = true];
 inline bool Signal::has_frequency_range() const {
   return frequency_measurement_case() == kFrequencyRange;
 }
@@ -2586,7 +2587,7 @@ inline ::anduril::entitymanager::v1::FrequencyRange* Signal::mutable_frequency_r
   return _msg;
 }
 
-// .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz"];
+// .google.protobuf.DoubleValue bandwidth_hz = 3 [json_name = "bandwidthHz", (.anduril.entitymanager.v1.overridable) = true];
 inline bool Signal::has_bandwidth_hz() const {
   bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.bandwidth_hz_ != nullptr);
@@ -2926,7 +2927,7 @@ inline ::anduril::entitymanager::v1::Fixed* Signal::mutable_fixed() ABSL_ATTRIBU
   return _msg;
 }
 
-// repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations"];
+// repeated .anduril.entitymanager.v1.EmitterNotation emitter_notations = 7 [json_name = "emitterNotations", (.anduril.entitymanager.v1.overridable) = true];
 inline int Signal::_internal_emitter_notations_size() const {
   return _internal_emitter_notations().size();
 }
@@ -2975,7 +2976,7 @@ Signal::_internal_mutable_emitter_notations() {
   return &_impl_.emitter_notations_;
 }
 
-// .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS"];
+// .google.protobuf.DoubleValue pulse_width_s = 8 [json_name = "pulseWidthS", (.anduril.entitymanager.v1.overridable) = true];
 inline bool Signal::has_pulse_width_s() const {
   bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.pulse_width_s_ != nullptr);
@@ -3066,7 +3067,7 @@ inline void Signal::set_allocated_pulse_width_s(::google::protobuf::DoubleValue*
   // @@protoc_insertion_point(field_set_allocated:anduril.entitymanager.v1.Signal.pulse_width_s)
 }
 
-// .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval"];
+// .anduril.entitymanager.v1.PulseRepetitionInterval pulse_repetition_interval = 9 [json_name = "pulseRepetitionInterval", (.anduril.entitymanager.v1.overridable) = true];
 inline bool Signal::has_pulse_repetition_interval() const {
   bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   PROTOBUF_ASSUME(!value || _impl_.pulse_repetition_interval_ != nullptr);