diff --git a/airflow/api_connexion/endpoints/asset_endpoint.py b/airflow/api_connexion/endpoints/asset_endpoint.py
index cbbe542ea7987..1ea1db2b3bbb8 100644
--- a/airflow/api_connexion/endpoints/asset_endpoint.py
+++ b/airflow/api_connexion/endpoints/asset_endpoint.py
@@ -133,7 +133,7 @@ def get_asset_events(
     query = select(AssetEvent)
 
     if asset_id:
-        query = query.where(AssetEvent.dataset_id == asset_id)
+        query = query.where(AssetEvent.asset_id == asset_id)
     if source_dag_id:
         query = query.where(AssetEvent.source_dag_id == source_dag_id)
     if source_task_id:
@@ -166,7 +166,7 @@ def _generate_queued_event_where_clause(
         where_clause.append(AssetDagRunQueue.target_dag_id == dag_id)
     if uri is not None:
         where_clause.append(
-            AssetDagRunQueue.dataset_id.in_(
+            AssetDagRunQueue.asset_id.in_(
                 select(AssetModel.id).where(AssetModel.uri == uri),
             ),
         )
@@ -187,7 +187,7 @@ def get_dag_asset_queued_event(
     where_clause = _generate_queued_event_where_clause(dag_id=dag_id, uri=uri, before=before)
     adrq = session.scalar(
         select(AssetDagRunQueue)
-        .join(AssetModel, AssetDagRunQueue.dataset_id == AssetModel.id)
+        .join(AssetModel, AssetDagRunQueue.asset_id == AssetModel.id)
         .where(*where_clause)
     )
     if adrq is None:
@@ -228,7 +228,7 @@ def get_dag_asset_queued_events(
     where_clause = _generate_queued_event_where_clause(dag_id=dag_id, before=before)
     query = (
         select(AssetDagRunQueue, AssetModel.uri)
-        .join(AssetModel, AssetDagRunQueue.dataset_id == AssetModel.id)
+        .join(AssetModel, AssetDagRunQueue.asset_id == AssetModel.id)
         .where(*where_clause)
     )
     result = session.execute(query).all()
@@ -278,7 +278,7 @@ def get_asset_queued_events(
     )
     query = (
         select(AssetDagRunQueue, AssetModel.uri)
-        .join(AssetModel, AssetDagRunQueue.dataset_id == AssetModel.id)
+        .join(AssetModel, AssetDagRunQueue.asset_id == AssetModel.id)
         .where(*where_clause)
     )
     total_entries = get_query_count(query, session=session)
diff --git a/airflow/api_connexion/endpoints/dag_run_endpoint.py b/airflow/api_connexion/endpoints/dag_run_endpoint.py
index 74eae13ddd4d0..e0d83575611b0 100644
--- a/airflow/api_connexion/endpoints/dag_run_endpoint.py
+++ b/airflow/api_connexion/endpoints/dag_run_endpoint.py
@@ -130,7 +130,7 @@ def get_upstream_asset_events(*, dag_id: str, dag_run_id: str, session: Session
             "DAGRun not found",
             detail=f"DAGRun with DAG ID: '{dag_id}' and DagRun ID: '{dag_run_id}' not found",
         )
-    events = dag_run.consumed_dataset_events
+    events = dag_run.consumed_asset_events
     return asset_event_collection_schema.dump(
         AssetEventCollection(asset_events=events, total_entries=len(events))
     )
diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
index e99f91639c49e..af38326489a4a 100644
--- a/airflow/api_connexion/openapi/v1.yaml
+++ b/airflow/api_connexion/openapi/v1.yaml
@@ -1146,6 +1146,7 @@ paths:
         Get asset for a dag run.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/dagRuns/{dag_run_id}/upstreamDatasetEvents"
       x-openapi-router-controller: airflow.api_connexion.endpoints.dag_run_endpoint
       operationId: get_upstream_asset_events
       tags: [DAGRun, Asset]
@@ -1211,6 +1212,7 @@ paths:
         Get a queued asset event for a DAG.
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_dag_asset_queued_event
       parameters:
@@ -1236,6 +1238,7 @@ paths:
         Delete a queued Asset event for a DAG.
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: delete_dag_asset_queued_event
       parameters:
@@ -1263,6 +1266,7 @@ paths:
         Get queued Asset events for a DAG.
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_dag_asset_queued_events
       parameters:
@@ -1288,6 +1292,7 @@ paths:
         Delete queued Asset events for a DAG.
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: delete_dag_asset_queued_events
       parameters:
@@ -1336,6 +1341,7 @@ paths:
         Get queued Asset events for an Asset
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_asset_queued_events
       parameters:
@@ -1361,6 +1367,7 @@ paths:
         Delete queued Asset events for a Asset.
 
         *New in version 2.9.0*
+        *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: delete_asset_queued_events
       parameters:
@@ -2480,6 +2487,8 @@ paths:
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_assets
       tags: [Asset]
+      description: |
+        *Changed in 3.0.0*: The endpoint value was renamed from "/datasets"
       parameters:
         - $ref: "#/components/parameters/PageLimit"
         - $ref: "#/components/parameters/PageOffset"
@@ -2517,7 +2526,10 @@ paths:
       - $ref: "#/components/parameters/AssetURI"
     get:
       summary: Get an asset
-      description: Get an asset by uri.
+      description: |
+        Get an asset by uri.
+
+        *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/{uri}"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_asset
       tags: [Asset]
@@ -2538,7 +2550,10 @@ paths:
   /assets/events:
     get:
       summary: Get asset events
-      description: Get asset events
+      description: |
+        Get asset events
+
+        *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: get_asset_events
       tags: [Asset]
@@ -2566,7 +2581,10 @@ paths:
           $ref: "#/components/responses/NotFound"
     post:
       summary: Create asset event
-      description: Create asset event
+      description: |
+        Create asset event
+
+        *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
       x-openapi-router-controller: airflow.api_connexion.endpoints.asset_endpoint
       operationId: create_asset_event
       tags: [Asset]
@@ -3299,7 +3317,9 @@ components:
             - backfill
             - manual
             - scheduled
-            - dataset_triggered
+            - asset_triggered
+          description: |
+            *Changed in 3.0.0*: The asset_triggered value was renamed from dataset_triggered.
         state:
           $ref: "#/components/schemas/DagState"
         external_trigger:
@@ -4088,9 +4108,12 @@ components:
             dag_run_timeout:
               $ref: "#/components/schemas/TimeDelta"
               nullable: true
-            dataset_expression:
+            asset_expression:
               type: object
-              description: Nested asset any/all conditions
+              description: |
+                Nested asset any/all conditions
+
+                *Changed in 3.0.0*: The asset_expression value was renamed from dataset_expression.
               nullable: true
             doc_md:
               type: string
@@ -4475,6 +4498,7 @@ components:
         An asset item.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from Dataset.
       type: object
       properties:
         id:
@@ -4510,6 +4534,7 @@ components:
         An asset reference to an upstream task.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from TaskOutletDatasetReference.
       type: object
       properties:
         dag_id:
@@ -4534,6 +4559,7 @@ components:
         An asset reference to a downstream DAG.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from DagScheduleDatasetReference.
       type: object
       properties:
         dag_id:
@@ -4554,6 +4580,7 @@ components:
         A collection of assets.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from DatasetCollection.
       type: object
       allOf:
         - type: object
@@ -4562,6 +4589,8 @@ components:
               type: array
               items:
                 $ref: "#/components/schemas/Asset"
+              description: |
+                *Changed in 3.0.0*: This was renamed from datasets.
         - $ref: "#/components/schemas/CollectionInfo"
 
     AssetEvent:
@@ -4569,14 +4598,21 @@ components:
         An asset event.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from DatasetEvent.
       type: object
       properties:
-        dataset_id:
+        asset_id:
           type: integer
-          description: The asset id
-        dataset_uri:
+          description: |
+            The asset id
+
+            *Changed in 3.0.0*: This was renamed from dataset_id.
+        asset_uri:
           type: string
-          description: The URI of the asset
+          description: |
+            The URI of the asset
+
+            *Changed in 3.0.0*: This was renamed from dataset_uri.
           nullable: false
         extra:
           type: object
@@ -4611,10 +4647,15 @@ components:
       type: object
       required:
         - asset_uri
+      description: |
+        *Changed in 3.0.0*: This was renamed from CreateDatasetEvent.
       properties:
         asset_uri:
           type: string
-          description: The URI of the asset
+          description: |
+            The URI of the asset
+
+            *Changed in 3.0.0*: This was renamed from dataset_uri.
           nullable: false
         extra:
           type: object
@@ -4705,12 +4746,15 @@ components:
         A collection of asset events.
 
         *New in version 2.4.0*
+        *Changed in 3.0.0*: This was renamed from DatasetEventCollection.
       type: object
       allOf:
         - type: object
           properties:
             asset_events:
               type: array
+              description: |
+                *Changed in 3.0.0*: This was renamed from dataset_events.
               items:
                 $ref: "#/components/schemas/AssetEvent"
         - $ref: "#/components/schemas/CollectionInfo"
@@ -5515,7 +5559,10 @@ components:
         type: string
         format: path
       required: true
-      description: The encoded Asset URI
+      description: |
+        The encoded Asset URI
+
+        *Changed in 3.0.0*: This was renamed from DatasetURI.
 
     PoolName:
       in: path
@@ -5701,7 +5748,10 @@ components:
       name: asset_id
       schema:
         type: integer
-      description: The Asset ID that updated the asset.
+      description: |
+        The Asset ID that updated the asset.
+
+        *Changed in 3.0.0*: This was renamed from FilterDatasetID.
 
     FilterSourceDAGID:
       in: query
diff --git a/airflow/api_connexion/schemas/asset_schema.py b/airflow/api_connexion/schemas/asset_schema.py
index 662f73a50d8b9..7f84b799d1a77 100644
--- a/airflow/api_connexion/schemas/asset_schema.py
+++ b/airflow/api_connexion/schemas/asset_schema.py
@@ -136,8 +136,8 @@ class Meta:
         model = AssetEvent
 
     id = auto_field()
-    dataset_id = auto_field()
-    dataset_uri = fields.String(attribute="dataset.uri", dump_only=True)
+    asset_id = auto_field()
+    asset_uri = fields.String(attribute="asset.uri", dump_only=True)
     extra = JsonObjectField()
     source_task_id = auto_field()
     source_dag_id = auto_field()
diff --git a/airflow/api_connexion/schemas/dag_schema.py b/airflow/api_connexion/schemas/dag_schema.py
index 6c7ff6fdc30e0..3ca650ac9a5e9 100644
--- a/airflow/api_connexion/schemas/dag_schema.py
+++ b/airflow/api_connexion/schemas/dag_schema.py
@@ -98,7 +98,7 @@ class DAGDetailSchema(DAGSchema):
     catchup = fields.Boolean(dump_only=True)
     orientation = fields.String(dump_only=True)
     max_active_tasks = fields.Integer(dump_only=True)
-    dataset_expression = fields.Dict(allow_none=True)
+    asset_expression = fields.Dict(allow_none=True)
     start_date = fields.DateTime(dump_only=True)
     dag_run_timeout = fields.Nested(TimeDeltaSchema, attribute="dagrun_timeout", dump_only=True)
     doc_md = fields.String(dump_only=True)
diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
index 325a6354de2b2..ebe209334d5ce 100644
--- a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
+++ b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -1377,11 +1377,11 @@ components:
             format: duration
           - type: 'null'
           title: Dag Run Timeout
-        dataset_expression:
+        asset_expression:
           anyOf:
           - type: object
           - type: 'null'
-          title: Dataset Expression
+          title: Asset Expression
         doc_md:
           anyOf:
           - type: string
@@ -1472,7 +1472,7 @@ components:
       - owners
       - catchup
       - dag_run_timeout
-      - dataset_expression
+      - asset_expression
       - doc_md
       - start_date
       - end_date
@@ -1764,15 +1764,15 @@ components:
         manual:
           type: integer
           title: Manual
-        dataset_triggered:
+        asset_triggered:
           type: integer
-          title: Dataset Triggered
+          title: Asset Triggered
       type: object
       required:
       - backfill
       - scheduled
       - manual
-      - dataset_triggered
+      - asset_triggered
       title: DAGRunTypes
       description: DAG Run Types for responses.
     DAGTagCollectionResponse:
@@ -1844,7 +1844,7 @@ components:
       - backfill
       - scheduled
       - manual
-      - dataset_triggered
+      - asset_triggered
       title: DagRunType
       description: Class with DagRun types.
     DagTagPydantic:
diff --git a/airflow/api_fastapi/core_api/routes/ui/assets.py b/airflow/api_fastapi/core_api/routes/ui/assets.py
index b8a17c7398424..6786bc30ae680 100644
--- a/airflow/api_fastapi/core_api/routes/ui/assets.py
+++ b/airflow/api_fastapi/core_api/routes/ui/assets.py
@@ -56,11 +56,11 @@ async def next_run_assets(
                 AssetModel.uri,
                 func.max(AssetEvent.timestamp).label("lastUpdate"),
             )
-            .join(DagScheduleAssetReference, DagScheduleAssetReference.dataset_id == AssetModel.id)
+            .join(DagScheduleAssetReference, DagScheduleAssetReference.asset_id == AssetModel.id)
             .join(
                 AssetDagRunQueue,
                 and_(
-                    AssetDagRunQueue.dataset_id == AssetModel.id,
+                    AssetDagRunQueue.asset_id == AssetModel.id,
                     AssetDagRunQueue.target_dag_id == DagScheduleAssetReference.dag_id,
                 ),
                 isouter=True,
@@ -68,7 +68,7 @@ async def next_run_assets(
             .join(
                 AssetEvent,
                 and_(
-                    AssetEvent.dataset_id == AssetModel.id,
+                    AssetEvent.asset_id == AssetModel.id,
                     (
                         AssetEvent.timestamp >= latest_run.execution_date
                         if latest_run and latest_run.execution_date
@@ -82,5 +82,5 @@ async def next_run_assets(
             .order_by(AssetModel.uri)
         )
     ]
-    data = {"dataset_expression": dag_model.dataset_expression, "events": events}
+    data = {"asset_expression": dag_model.asset_expression, "events": events}
     return data
diff --git a/airflow/api_fastapi/core_api/serializers/dags.py b/airflow/api_fastapi/core_api/serializers/dags.py
index 39e85ea8c6f0e..a3e11de36039b 100644
--- a/airflow/api_fastapi/core_api/serializers/dags.py
+++ b/airflow/api_fastapi/core_api/serializers/dags.py
@@ -112,7 +112,7 @@ class DAGDetailsResponse(DAGResponse):
 
     catchup: bool
     dag_run_timeout: timedelta | None
-    dataset_expression: dict | None
+    asset_expression: dict | None
     doc_md: str | None
     start_date: datetime | None
     end_date: datetime | None
diff --git a/airflow/api_fastapi/core_api/serializers/dashboard.py b/airflow/api_fastapi/core_api/serializers/dashboard.py
index ee31a812945ec..66adc8ed3df92 100644
--- a/airflow/api_fastapi/core_api/serializers/dashboard.py
+++ b/airflow/api_fastapi/core_api/serializers/dashboard.py
@@ -25,7 +25,7 @@ class DAGRunTypes(BaseModel):
     backfill: int
     scheduled: int
     manual: int
-    dataset_triggered: int
+    asset_triggered: int
 
 
 class DAGRunStates(BaseModel):
diff --git a/airflow/assets/__init__.py b/airflow/assets/__init__.py
index 4dbc35fb95397..dcc5484656eb7 100644
--- a/airflow/assets/__init__.py
+++ b/airflow/assets/__init__.py
@@ -169,7 +169,7 @@ def expand_alias_to_assets(alias: str | AssetAlias, *, session: Session = NEW_SE
         select(AssetAliasModel).where(AssetAliasModel.name == alias_name).limit(1)
     )
     if asset_alias_obj:
-        return [asset.to_public() for asset in asset_alias_obj.datasets]
+        return [asset.to_public() for asset in asset_alias_obj.assets]
     return []
 
 
diff --git a/airflow/assets/manager.py b/airflow/assets/manager.py
index cd4d72e633a8e..a06c7c31786f5 100644
--- a/airflow/assets/manager.py
+++ b/airflow/assets/manager.py
@@ -138,7 +138,7 @@ def register_asset_change(
         cls._add_asset_alias_association({alias.name for alias in aliases}, asset_model, session=session)
 
         event_kwargs = {
-            "dataset_id": asset_model.id,
+            "asset_id": asset_model.id,
             "extra": extra,
         }
         if task_instance:
@@ -167,7 +167,7 @@ def register_asset_change(
             ).unique()
 
             for asset_alias_model in asset_alias_models:
-                asset_alias_model.dataset_events.append(asset_event)
+                asset_alias_model.asset_events.append(asset_event)
                 session.add(asset_alias_model)
 
                 dags_to_queue_from_asset_alias |= {
@@ -224,7 +224,7 @@ def _queue_dagruns(cls, asset_id: int, dags_to_queue: set[DagModel], session: Se
     @classmethod
     def _slow_path_queue_dagruns(cls, asset_id: int, dags_to_queue: set[DagModel], session: Session) -> None:
         def _queue_dagrun_if_needed(dag: DagModel) -> str | None:
-            item = AssetDagRunQueue(target_dag_id=dag.dag_id, dataset_id=asset_id)
+            item = AssetDagRunQueue(target_dag_id=dag.dag_id, asset_id=asset_id)
             # Don't error whole transaction when a single RunQueue item conflicts.
             # https://docs.sqlalchemy.org/en/14/orm/session_transaction.html#using-savepoint
             try:
@@ -243,7 +243,7 @@ def _postgres_queue_dagruns(cls, asset_id: int, dags_to_queue: set[DagModel], se
         from sqlalchemy.dialects.postgresql import insert
 
         values = [{"target_dag_id": dag.dag_id} for dag in dags_to_queue]
-        stmt = insert(AssetDagRunQueue).values(dataset_id=asset_id).on_conflict_do_nothing()
+        stmt = insert(AssetDagRunQueue).values(asset_id=asset_id).on_conflict_do_nothing()
         session.execute(stmt, values)
 
     @classmethod
diff --git a/airflow/dag_processing/collection.py b/airflow/dag_processing/collection.py
index 068a3727d04c0..034c9c0540125 100644
--- a/airflow/dag_processing/collection.py
+++ b/airflow/dag_processing/collection.py
@@ -67,9 +67,9 @@ def _find_orm_dags(dag_ids: Iterable[str], *, session: Session) -> dict[str, Dag
         select(DagModel)
         .options(joinedload(DagModel.tags, innerjoin=False))
         .where(DagModel.dag_id.in_(dag_ids))
-        .options(joinedload(DagModel.schedule_dataset_references))
-        .options(joinedload(DagModel.schedule_dataset_alias_references))
-        .options(joinedload(DagModel.task_outlet_dataset_references))
+        .options(joinedload(DagModel.schedule_asset_references))
+        .options(joinedload(DagModel.schedule_asset_alias_references))
+        .options(joinedload(DagModel.task_outlet_asset_references))
     )
     stmt = with_row_locks(stmt, of=DagModel, session=session)
     return {dm.dag_id: dm for dm in session.scalars(stmt).unique()}
@@ -223,7 +223,7 @@ def update_dags(
             )
             dm.timetable_summary = dag.timetable.summary
             dm.timetable_description = dag.timetable.description
-            dm.dataset_expression = dag.timetable.asset_condition.as_expression()
+            dm.asset_expression = dag.timetable.asset_condition.as_expression()
             dm.processor_subdir = processor_subdir
 
             last_automated_run: DagRun | None = run_info.latest_runs.get(dag.dag_id)
@@ -237,8 +237,8 @@ def update_dags(
                 dm.calculate_dagrun_date_fields(dag, last_automated_data_interval)
 
             if not dag.timetable.asset_condition:
-                dm.schedule_dataset_references = []
-                dm.schedule_dataset_alias_references = []
+                dm.schedule_asset_references = []
+                dm.schedule_asset_alias_references = []
             # FIXME: STORE NEW REFERENCES.
 
             if dag.tags:
@@ -367,15 +367,15 @@ def add_dag_asset_references(
         for dag_id, references in self.schedule_asset_references.items():
             # Optimization: no references at all; this is faster than repeated delete().
             if not references:
-                dags[dag_id].schedule_dataset_references = []
+                dags[dag_id].schedule_asset_references = []
                 continue
             referenced_asset_ids = {asset.id for asset in (assets[r.uri] for r in references)}
-            orm_refs = {r.dataset_id: r for r in dags[dag_id].schedule_dataset_references}
+            orm_refs = {r.asset_id: r for r in dags[dag_id].schedule_asset_references}
             for asset_id, ref in orm_refs.items():
                 if asset_id not in referenced_asset_ids:
                     session.delete(ref)
             session.bulk_save_objects(
-                DagScheduleAssetReference(dataset_id=asset_id, dag_id=dag_id)
+                DagScheduleAssetReference(asset_id=asset_id, dag_id=dag_id)
                 for asset_id in referenced_asset_ids
                 if asset_id not in orm_refs
             )
@@ -393,10 +393,10 @@ def add_dag_asset_alias_references(
         for dag_id, references in self.schedule_asset_alias_references.items():
             # Optimization: no references at all; this is faster than repeated delete().
             if not references:
-                dags[dag_id].schedule_dataset_alias_references = []
+                dags[dag_id].schedule_asset_alias_references = []
                 continue
             referenced_alias_ids = {alias.id for alias in (aliases[r.name] for r in references)}
-            orm_refs = {a.alias_id: a for a in dags[dag_id].schedule_dataset_alias_references}
+            orm_refs = {a.alias_id: a for a in dags[dag_id].schedule_asset_alias_references}
             for alias_id, ref in orm_refs.items():
                 if alias_id not in referenced_alias_ids:
                     session.delete(ref)
@@ -419,18 +419,18 @@ def add_task_asset_references(
         for dag_id, references in self.outlet_references.items():
             # Optimization: no references at all; this is faster than repeated delete().
             if not references:
-                dags[dag_id].task_outlet_dataset_references = []
+                dags[dag_id].task_outlet_asset_references = []
                 continue
             referenced_outlets = {
                 (task_id, asset.id)
                 for task_id, asset in ((task_id, assets[d.uri]) for task_id, d in references)
             }
-            orm_refs = {(r.task_id, r.dataset_id): r for r in dags[dag_id].task_outlet_dataset_references}
+            orm_refs = {(r.task_id, r.asset_id): r for r in dags[dag_id].task_outlet_asset_references}
             for key, ref in orm_refs.items():
                 if key not in referenced_outlets:
                     session.delete(ref)
             session.bulk_save_objects(
-                TaskOutletAssetReference(dataset_id=asset_id, dag_id=dag_id, task_id=task_id)
+                TaskOutletAssetReference(asset_id=asset_id, dag_id=dag_id, task_id=task_id)
                 for task_id, asset_id in referenced_outlets
                 if (task_id, asset_id) not in orm_refs
             )
diff --git a/airflow/jobs/scheduler_job_runner.py b/airflow/jobs/scheduler_job_runner.py
index a052bf700db7d..233b687d1069f 100644
--- a/airflow/jobs/scheduler_job_runner.py
+++ b/airflow/jobs/scheduler_job_runner.py
@@ -1272,15 +1272,15 @@ def _do_scheduling(self, session: Session) -> int:
     @retry_db_transaction
     def _create_dagruns_for_dags(self, guard: CommitProhibitorGuard, session: Session) -> None:
         """Find Dag Models needing DagRuns and Create Dag Runs with retries in case of OperationalError."""
-        query, dataset_triggered_dag_info = DagModel.dags_needing_dagruns(session)
+        query, asset_triggered_dag_info = DagModel.dags_needing_dagruns(session)
         all_dags_needing_dag_runs = set(query.all())
-        dataset_triggered_dags = [
-            dag for dag in all_dags_needing_dag_runs if dag.dag_id in dataset_triggered_dag_info
+        asset_triggered_dags = [
+            dag for dag in all_dags_needing_dag_runs if dag.dag_id in asset_triggered_dag_info
         ]
-        non_dataset_dags = all_dags_needing_dag_runs.difference(dataset_triggered_dags)
-        self._create_dag_runs(non_dataset_dags, session)
-        if dataset_triggered_dags:
-            self._create_dag_runs_asset_triggered(dataset_triggered_dags, dataset_triggered_dag_info, session)
+        non_asset_dags = all_dags_needing_dag_runs.difference(asset_triggered_dags)
+        self._create_dag_runs(non_asset_dags, session)
+        if asset_triggered_dags:
+            self._create_dag_runs_asset_triggered(asset_triggered_dags, asset_triggered_dag_info, session)
 
         # commit the session - Release the write lock on DagModel table.
         guard.commit()
@@ -1391,7 +1391,7 @@ def _create_dag_runs(self, dag_models: Collection[DagModel], session: Session) -
     def _create_dag_runs_asset_triggered(
         self,
         dag_models: Collection[DagModel],
-        dataset_triggered_dag_info: dict[str, tuple[datetime, datetime]],
+        asset_triggered_dag_info: dict[str, tuple[datetime, datetime]],
         session: Session,
     ) -> None:
         """For DAGs that are triggered by assets, create dag runs."""
@@ -1401,7 +1401,7 @@ def _create_dag_runs_asset_triggered(
         # duplicate dag runs
         exec_dates = {
             dag_id: timezone.coerce_datetime(last_time)
-            for dag_id, (_, last_time) in dataset_triggered_dag_info.items()
+            for dag_id, (_, last_time) in asset_triggered_dag_info.items()
         }
         existing_dagruns: set[tuple[str, timezone.DateTime]] = set(
             session.execute(
@@ -1441,7 +1441,7 @@ def _create_dag_runs_asset_triggered(
                     .where(
                         DagRun.dag_id == dag.dag_id,
                         DagRun.execution_date < exec_date,
-                        DagRun.run_type == DagRunType.DATASET_TRIGGERED,
+                        DagRun.run_type == DagRunType.ASSET_TRIGGERED,
                     )
                     .order_by(DagRun.execution_date.desc())
                     .limit(1)
@@ -1457,14 +1457,14 @@ def _create_dag_runs_asset_triggered(
                     select(AssetEvent)
                     .join(
                         DagScheduleAssetReference,
-                        AssetEvent.dataset_id == DagScheduleAssetReference.dataset_id,
+                        AssetEvent.asset_id == DagScheduleAssetReference.asset_id,
                     )
                     .where(*asset_event_filters)
                 ).all()
 
                 data_interval = dag.timetable.data_interval_for_events(exec_date, asset_events)
                 run_id = dag.timetable.generate_run_id(
-                    run_type=DagRunType.DATASET_TRIGGERED,
+                    run_type=DagRunType.ASSET_TRIGGERED,
                     logical_date=exec_date,
                     data_interval=data_interval,
                     session=session,
@@ -1473,7 +1473,7 @@ def _create_dag_runs_asset_triggered(
 
                 dag_run = dag.create_dagrun(
                     run_id=run_id,
-                    run_type=DagRunType.DATASET_TRIGGERED,
+                    run_type=DagRunType.ASSET_TRIGGERED,
                     execution_date=exec_date,
                     data_interval=data_interval,
                     state=DagRunState.QUEUED,
@@ -1484,7 +1484,7 @@ def _create_dag_runs_asset_triggered(
                     triggered_by=DagRunTriggeredByType.DATASET,
                 )
                 Stats.incr("asset.triggered_dagruns")
-                dag_run.consumed_dataset_events.extend(asset_events)
+                dag_run.consumed_asset_events.extend(asset_events)
                 session.execute(
                     delete(AssetDagRunQueue).where(AssetDagRunQueue.target_dag_id == dag_run.dag_id)
                 )
diff --git a/airflow/listeners/spec/asset.py b/airflow/listeners/spec/asset.py
index 78b14c8b10aeb..dba9ac700e415 100644
--- a/airflow/listeners/spec/asset.py
+++ b/airflow/listeners/spec/asset.py
@@ -33,8 +33,8 @@ def on_asset_created(asset: Asset):
 
 
 @hookspec
-def on_asset_alias_created(dataset_alias: AssetAlias):
-    """Execute when a new dataset alias is created."""
+def on_asset_alias_created(asset_alias: AssetAlias):
+    """Execute when a new asset alias is created."""
 
 
 @hookspec
diff --git a/airflow/migrations/versions/0040_3_0_0_rename_dataset_as_asset.py b/airflow/migrations/versions/0040_3_0_0_rename_dataset_as_asset.py
new file mode 100644
index 0000000000000..70261b75c7b56
--- /dev/null
+++ b/airflow/migrations/versions/0040_3_0_0_rename_dataset_as_asset.py
@@ -0,0 +1,693 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Rename dataset as asset.
+
+Revision ID: 05234396c6fc
+Revises: 3a8972ecb8f9
+Create Date: 2024-10-02 08:10:01.697128
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+import sqlalchemy_jsonfield
+from alembic import op
+
+from airflow.settings import json
+
+# revision identifiers, used by Alembic.
+revision = "05234396c6fc"
+down_revision = "3a8972ecb8f9"
+branch_labels = None
+depends_on = None
+airflow_version = "3.0.0"
+
+if TYPE_CHECKING:
+    from alembic.operations.base import BatchOperations
+    from sqlalchemy.sql.elements import conv
+
+
+def _rename_index(
+    *, batch_op: BatchOperations, original_name: str, new_name: str, columns: list[str], unique: bool
+) -> None:
+    batch_op.drop_index(original_name)
+    batch_op.create_index(new_name, columns, unique=unique)
+
+
+def _rename_fk_constraint(
+    *,
+    batch_op: BatchOperations,
+    original_name: str | conv,
+    new_name: str | conv,
+    referent_table: str,
+    local_cols: list[str],
+    remote_cols: list[str],
+    ondelete: str,
+) -> None:
+    batch_op.drop_constraint(original_name, type_="foreignkey")
+    batch_op.create_foreign_key(
+        constraint_name=new_name,
+        referent_table=referent_table,
+        local_cols=local_cols,
+        remote_cols=remote_cols,
+        ondelete=ondelete,
+    )
+
+
+def _rename_pk_constraint(
+    *, batch_op: BatchOperations, original_name: str, new_name: str, columns: list[str]
+) -> None:
+    if batch_op.get_bind().dialect.name in ("postgresql", "mysql"):
+        batch_op.drop_constraint(original_name, type_="primary")
+    batch_op.create_primary_key(constraint_name=new_name, columns=columns)
+
+
+# original table name to new table name
+table_name_mappings = (
+    ("dataset_alias_dataset", "asset_alias_asset"),
+    ("dataset_alias_dataset_event", "asset_alias_asset_event"),
+    ("dataset_alias", "asset_alias"),
+    ("dataset", "asset"),
+    ("dag_schedule_dataset_alias_reference", "dag_schedule_asset_alias_reference"),
+    ("dag_schedule_dataset_reference", "dag_schedule_asset_reference"),
+    ("task_outlet_dataset_reference", "task_outlet_asset_reference"),
+    ("dataset_dag_run_queue", "asset_dag_run_queue"),
+    ("dagrun_dataset_event", "dagrun_asset_event"),
+    ("dataset_event", "asset_event"),
+)
+
+
+def upgrade():
+    """Rename dataset as asset."""
+    # Rename tables
+    for original_name, new_name in table_name_mappings:
+        op.rename_table(original_name, new_name)
+
+    with op.batch_alter_table("asset_active", schema=None) as batch_op:
+        batch_op.drop_constraint("asset_active_asset_name_uri_fkey", type_="foreignkey")
+
+    with op.batch_alter_table("asset", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_name_uri_unique",
+            new_name="idx_asset_name_uri_unique",
+            columns=["name", "uri"],
+            unique=True,
+        )
+
+    with op.batch_alter_table("asset_active", schema=None) as batch_op:
+        batch_op.create_foreign_key(
+            constraint_name="asset_active_asset_name_uri_fkey",
+            referent_table="asset",
+            local_cols=["name", "uri"],
+            remote_cols=["name", "uri"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("asset_alias_asset", schema=None) as batch_op:
+        batch_op.alter_column("dataset_id", new_column_name="asset_id", type_=sa.Integer(), nullable=False)
+
+    with op.batch_alter_table("asset_alias_asset", schema=None) as batch_op:
+        batch_op.drop_constraint(op.f("dataset_alias_dataset_alias_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_alias_dataset_alias_id",
+            new_name="idx_asset_alias_asset_alias_id",
+            columns=["alias_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="asset_alias_asset_alias_id_fk_key",
+            referent_table="asset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint(op.f("dataset_alias_dataset_dataset_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_alias_dataset_alias_dataset_id",
+            new_name="idx_asset_alias_asset_asset_id",
+            columns=["asset_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="asset_alias_asset_asset_id_fk_key",
+            referent_table="asset",
+            local_cols=["asset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("asset_alias_asset_event", schema=None) as batch_op:
+        batch_op.drop_constraint(op.f("dataset_alias_dataset_event_alias_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_alias_dataset_event_alias_id",
+            new_name="idx_asset_alias_asset_event_alias_id",
+            columns=["alias_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("asset_alias_asset_event_asset_id_fkey"),
+            referent_table="asset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint(op.f("dataset_alias_dataset_event_event_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_alias_dataset_event_event_id",
+            new_name="idx_asset_alias_asset_event_event_id",
+            columns=["event_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("asset_alias_asset_event_event_id_fk_key"),
+            referent_table="asset_event",
+            local_cols=["event_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dag_schedule_asset_alias_reference", schema=None) as batch_op:
+        batch_op.drop_constraint("dsdar_dataset_fkey", type_="foreignkey")
+        batch_op.drop_constraint("dsdar_dag_id_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="dsdar_pkey",
+            new_name="asaar_pkey",
+            columns=["alias_id", "dag_id"],
+        )
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dag_schedule_dataset_alias_reference_dag_id",
+            new_name="idx_dag_schedule_asset_alias_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="dsaar_asset_alias_fkey",
+            referent_table="asset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dsaar_dag_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op:
+        batch_op.alter_column("dataset_id", new_column_name="asset_id", type_=sa.Integer(), nullable=False)
+
+    with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op:
+        batch_op.drop_constraint("dsdr_dag_id_fkey", type_="foreignkey")
+        if op.get_bind().dialect.name in ("postgres", "mysql"):
+            batch_op.drop_constraint("dsdr_dataset_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="dsdr_pkey",
+            new_name="dsar_pkey",
+            columns=["asset_id", "dag_id"],
+        )
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dag_schedule_dataset_reference_dag_id",
+            new_name="idx_dag_schedule_asset_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="dsar_dag_id_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dsar_asset_fkey",
+            referent_table="asset",
+            local_cols=["asset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("task_outlet_asset_reference", schema=None) as batch_op:
+        batch_op.alter_column("dataset_id", new_column_name="asset_id", type_=sa.Integer(), nullable=False)
+
+        batch_op.drop_constraint("todr_dag_id_fkey", type_="foreignkey")
+        if op.get_bind().dialect.name in ("postgres", "mysql"):
+            batch_op.drop_constraint("todr_dataset_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="todr_pkey",
+            new_name="toar_pkey",
+            columns=["asset_id", "dag_id", "task_id"],
+        )
+
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_task_outlet_dataset_reference_dag_id",
+            new_name="idx_task_outlet_asset_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="toar_asset_fkey",
+            referent_table="asset",
+            local_cols=["asset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="toar_dag_id_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("asset_dag_run_queue", schema=None) as batch_op:
+        batch_op.alter_column("dataset_id", new_column_name="asset_id", type_=sa.Integer(), nullable=False)
+
+        batch_op.drop_constraint("ddrq_dag_fkey", type_="foreignkey")
+        if op.get_bind().dialect.name in ("postgres", "mysql"):
+            batch_op.drop_constraint("ddrq_dataset_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="datasetdagrunqueue_pkey",
+            new_name="assetdagrunqueue_pkey",
+            columns=["asset_id", "target_dag_id"],
+        )
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_dag_run_queue_target_dag_id",
+            new_name="idx_asset_dag_run_queue_target_dag_id",
+            columns=["target_dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="adrq_asset_fkey",
+            referent_table="asset",
+            local_cols=["asset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="adrq_dag_fkey",
+            referent_table="dag",
+            local_cols=["target_dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dagrun_asset_event", schema=None) as batch_op:
+        batch_op.drop_constraint("dagrun_dataset_event_event_id_fkey", type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dagrun_dataset_events_dag_run_id",
+            new_name="idx_dagrun_asset_events_dag_run_id",
+            columns=["dag_run_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dagrun_asset_event_dag_run_id_fkey",
+            referent_table="dag_run",
+            local_cols=["dag_run_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint("dagrun_dataset_event_dag_run_id_fkey", type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dagrun_dataset_events_event_id",
+            new_name="idx_dagrun_asset_events_event_id",
+            columns=["event_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dagrun_asset_event_event_id_fkey",
+            referent_table="asset_event",
+            local_cols=["event_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("asset_event", schema=None) as batch_op:
+        batch_op.alter_column("dataset_id", new_column_name="asset_id", type_=sa.Integer(), nullable=False)
+
+    with op.batch_alter_table("asset_event", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_id_timestamp",
+            new_name="idx_asset_id_timestamp",
+            columns=["asset_id", "timestamp"],
+            unique=False,
+        )
+
+    with op.batch_alter_table("asset_alias", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dataset_alias_name_unique",
+            new_name="idx_asset_alias_name_unique",
+            columns=["name"],
+            unique=True,
+        )
+
+    with op.batch_alter_table("dag", schema=None) as batch_op:
+        batch_op.alter_column(
+            "dataset_expression",
+            new_column_name="asset_expression",
+            type_=sqlalchemy_jsonfield.JSONField(json=json),
+        )
+
+
+def downgrade():
+    """Unapply Rename dataset as asset."""
+    # Rename tables
+    for original_name, new_name in table_name_mappings:
+        op.rename_table(new_name, original_name)
+
+    with op.batch_alter_table("asset_active", schema=None) as batch_op:
+        batch_op.drop_constraint("asset_active_asset_name_uri_fkey", type_="foreignkey")
+
+    with op.batch_alter_table("dataset", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_name_uri_unique",
+            new_name="idx_dataset_name_uri_unique",
+            columns=["name", "uri"],
+            unique=True,
+        )
+
+    with op.batch_alter_table("asset_active", schema=None) as batch_op:
+        batch_op.create_foreign_key(
+            constraint_name="asset_active_asset_name_uri_fkey",
+            referent_table="dataset",
+            local_cols=["name", "uri"],
+            remote_cols=["name", "uri"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dataset_alias_dataset", schema=None) as batch_op:
+        batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
+
+    with op.batch_alter_table("dataset_alias_dataset", schema=None) as batch_op:
+        batch_op.drop_constraint(op.f("asset_alias_asset_alias_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_alias_asset_alias_id",
+            new_name="idx_dataset_alias_dataset_alias_id",
+            columns=["alias_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("dataset_alias_dataset_alias_id_fkey"),
+            referent_table="dataset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint(op.f("asset_alias_asset_asset_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_alias_asset_asset_id",
+            new_name="idx_dataset_alias_dataset_alias_dataset_id",
+            columns=["dataset_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("dataset_alias_dataset_dataset_id_fkey"),
+            referent_table="dataset",
+            local_cols=["dataset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dataset_alias_dataset_event", schema=None) as batch_op:
+        batch_op.drop_constraint(op.f("asset_alias_asset_event_alias_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_alias_asset_event_alias_id",
+            new_name="idx_dataset_alias_dataset_event_alias_id",
+            columns=["alias_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("dataset_alias_dataset_event_alias_id_fkey"),
+            referent_table="dataset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint(op.f("asset_alias_asset_event_event_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_alias_asset_event_event_id",
+            new_name="idx_dataset_alias_dataset_event_event_id",
+            columns=["event_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name=op.f("dataset_alias_dataset_event_event_id_fkey"),
+            referent_table="dataset_event",
+            local_cols=["event_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dag_schedule_dataset_alias_reference", schema=None) as batch_op:
+        batch_op.drop_constraint("dsaar_asset_alias_fkey", type_="foreignkey")
+        batch_op.drop_constraint("dsaar_dag_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="asaar_pkey",
+            new_name="dsdar_pkey",
+            columns=["alias_id", "dag_id"],
+        )
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dag_schedule_asset_alias_reference_dag_id",
+            new_name="idx_dag_schedule_dataset_alias_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="dsdar_dataset_fkey",
+            referent_table="dataset_alias",
+            local_cols=["alias_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dsdar_dag_id_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dag_schedule_dataset_reference", schema=None) as batch_op:
+        batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
+
+        batch_op.drop_constraint("dsar_dag_id_fkey", type_="foreignkey")
+        batch_op.drop_constraint("dsar_asset_fkey", type_="foreignkey")
+
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dag_schedule_asset_reference_dag_id",
+            new_name="idx_dag_schedule_dataset_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="dsar_pkey",
+            new_name="dsdr_pkey",
+            columns=["dataset_id", "dag_id"],
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="dsdr_dag_id_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dsdr_dataset_fkey",
+            referent_table="dataset",
+            local_cols=["dataset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("task_outlet_dataset_reference", schema=None) as batch_op:
+        batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
+
+        batch_op.drop_constraint("toar_asset_fkey", type_="foreignkey")
+        batch_op.drop_constraint("toar_dag_id_fkey", type_="foreignkey")
+
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_task_outlet_asset_reference_dag_id",
+            new_name="idx_task_outlet_dataset_reference_dag_id",
+            columns=["dag_id"],
+            unique=False,
+        )
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="toar_pkey",
+            new_name="todr_pkey",
+            columns=["dataset_id", "dag_id", "task_id"],
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="todr_dataset_fkey",
+            referent_table="dataset",
+            local_cols=["dataset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="todr_dag_id_fkey",
+            referent_table="dag",
+            local_cols=["dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dataset_dag_run_queue", schema=None) as batch_op:
+        batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
+
+        batch_op.drop_constraint("adrq_asset_fkey", type_="foreignkey")
+        batch_op.drop_constraint("adrq_dag_fkey", type_="foreignkey")
+
+        _rename_pk_constraint(
+            batch_op=batch_op,
+            original_name="assetdagrunqueue_pkey",
+            new_name="datasetdagrunqueue_pkey",
+            columns=["dataset_id", "target_dag_id"],
+        )
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_dag_run_queue_target_dag_id",
+            new_name="idx_dataset_dag_run_queue_target_dag_id",
+            columns=["target_dag_id"],
+            unique=False,
+        )
+
+        batch_op.create_foreign_key(
+            constraint_name="ddrq_dataset_fkey",
+            referent_table="dataset",
+            local_cols=["dataset_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            constraint_name="ddrq_dag_fkey",
+            referent_table="dag",
+            local_cols=["target_dag_id"],
+            remote_cols=["dag_id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dagrun_dataset_event", schema=None) as batch_op:
+        batch_op.drop_constraint(op.f("dagrun_asset_event_event_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dagrun_asset_events_event_id",
+            new_name="idx_dagrun_dataset_events_event_id",
+            columns=["event_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dagrun_dataset_event_event_id_fkey",
+            referent_table="dataset_event",
+            local_cols=["event_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+        batch_op.drop_constraint(op.f("dagrun_asset_event_dag_run_id_fkey"), type_="foreignkey")
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_dagrun_asset_events_dag_run_id",
+            new_name="idx_dagrun_dataset_events_dag_run_id",
+            columns=["dag_run_id"],
+            unique=False,
+        )
+        batch_op.create_foreign_key(
+            constraint_name="dagrun_dataset_event_dag_run_id_fkey",
+            referent_table="dag_run",
+            local_cols=["dag_run_id"],
+            remote_cols=["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table("dataset_event", schema=None) as batch_op:
+        batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
+
+    with op.batch_alter_table("dataset_event", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_id_timestamp",
+            new_name="idx_dataset_id_timestamp",
+            columns=["dataset_id", "timestamp"],
+            unique=False,
+        )
+
+    with op.batch_alter_table("dataset_alias", schema=None) as batch_op:
+        _rename_index(
+            batch_op=batch_op,
+            original_name="idx_asset_alias_name_unique",
+            new_name="idx_dataset_alias_name_unique",
+            columns=["name"],
+            unique=True,
+        )
+
+    with op.batch_alter_table("dag", schema=None) as batch_op:
+        batch_op.alter_column(
+            "asset_expression",
+            new_column_name="dataset_expression",
+            type_=sqlalchemy_jsonfield.JSONField(json=json),
+        )
diff --git a/airflow/models/asset.py b/airflow/models/asset.py
index 79f9b7389439d..2b810e3d0f641 100644
--- a/airflow/models/asset.py
+++ b/airflow/models/asset.py
@@ -40,45 +40,21 @@
 from airflow.utils.sqlalchemy import UtcDateTime
 
 alias_association_table = Table(
-    "dataset_alias_dataset",
+    "asset_alias_asset",
     Base.metadata,
-    Column("alias_id", ForeignKey("dataset_alias.id", ondelete="CASCADE"), primary_key=True),
-    Column("dataset_id", ForeignKey("dataset.id", ondelete="CASCADE"), primary_key=True),
-    Index("idx_dataset_alias_dataset_alias_id", "alias_id"),
-    Index("idx_dataset_alias_dataset_alias_dataset_id", "dataset_id"),
-    ForeignKeyConstraint(
-        ("alias_id",),
-        ["dataset_alias.id"],
-        name="ds_dsa_alias_id",
-        ondelete="CASCADE",
-    ),
-    ForeignKeyConstraint(
-        ("dataset_id",),
-        ["dataset.id"],
-        name="ds_dsa_dataset_id",
-        ondelete="CASCADE",
-    ),
+    Column("alias_id", ForeignKey("asset_alias.id", ondelete="CASCADE"), primary_key=True),
+    Column("asset_id", ForeignKey("asset.id", ondelete="CASCADE"), primary_key=True),
+    Index("idx_asset_alias_asset_alias_id", "alias_id"),
+    Index("idx_asset_alias_asset_asset_id", "asset_id"),
 )
 
-dataset_alias_dataset_event_assocation_table = Table(
-    "dataset_alias_dataset_event",
+asset_alias_asset_event_assocation_table = Table(
+    "asset_alias_asset_event",
     Base.metadata,
-    Column("alias_id", ForeignKey("dataset_alias.id", ondelete="CASCADE"), primary_key=True),
-    Column("event_id", ForeignKey("dataset_event.id", ondelete="CASCADE"), primary_key=True),
-    Index("idx_dataset_alias_dataset_event_alias_id", "alias_id"),
-    Index("idx_dataset_alias_dataset_event_event_id", "event_id"),
-    ForeignKeyConstraint(
-        ("alias_id",),
-        ["dataset_alias.id"],
-        name="dss_de_alias_id",
-        ondelete="CASCADE",
-    ),
-    ForeignKeyConstraint(
-        ("event_id",),
-        ["dataset_event.id"],
-        name="dss_de_event_id",
-        ondelete="CASCADE",
-    ),
+    Column("alias_id", ForeignKey("asset_alias.id", ondelete="CASCADE"), primary_key=True),
+    Column("event_id", ForeignKey("asset_event.id", ondelete="CASCADE"), primary_key=True),
+    Index("idx_asset_alias_asset_event_alias_id", "alias_id"),
+    Index("idx_asset_alias_asset_event_event_id", "event_id"),
 )
 
 
@@ -116,23 +92,23 @@ class AssetAliasModel(Base):
         nullable=False,
     )
 
-    __tablename__ = "dataset_alias"
+    __tablename__ = "asset_alias"
     __table_args__ = (
-        Index("idx_dataset_alias_name_unique", name, unique=True),
+        Index("idx_asset_alias_name_unique", name, unique=True),
         {"sqlite_autoincrement": True},  # ensures PK values not reused
     )
 
-    datasets = relationship(
+    assets = relationship(
         "AssetModel",
         secondary=alias_association_table,
         backref="aliases",
     )
-    dataset_events = relationship(
+    asset_events = relationship(
         "AssetEvent",
-        secondary=dataset_alias_dataset_event_assocation_table,
+        secondary=asset_alias_asset_event_assocation_table,
         back_populates="source_aliases",
     )
-    consuming_dags = relationship("DagScheduleAssetAliasReference", back_populates="dataset_alias")
+    consuming_dags = relationship("DagScheduleAssetAliasReference", back_populates="asset_alias")
 
     @classmethod
     def from_public(cls, obj: AssetAlias) -> AssetAliasModel:
@@ -207,12 +183,12 @@ class AssetModel(Base):
 
     active = relationship("AssetActive", uselist=False, viewonly=True)
 
-    consuming_dags = relationship("DagScheduleAssetReference", back_populates="dataset")
-    producing_tasks = relationship("TaskOutletAssetReference", back_populates="dataset")
+    consuming_dags = relationship("DagScheduleAssetReference", back_populates="asset")
+    producing_tasks = relationship("TaskOutletAssetReference", back_populates="asset")
 
-    __tablename__ = "dataset"
+    __tablename__ = "asset"
     __table_args__ = (
-        Index("idx_dataset_name_uri_unique", name, uri, unique=True),
+        Index("idx_asset_name_uri_unique", name, uri, unique=True),
         {"sqlite_autoincrement": True},  # ensures PK values not reused
     )
 
@@ -293,7 +269,7 @@ class AssetActive(Base):
         PrimaryKeyConstraint(name, uri, name="asset_active_pkey"),
         ForeignKeyConstraint(
             columns=[name, uri],
-            refcolumns=["dataset.name", "dataset.uri"],
+            refcolumns=["asset.name", "asset.uri"],
             name="asset_active_asset_name_uri_fkey",
             ondelete="CASCADE",
         ),
@@ -314,25 +290,25 @@ class DagScheduleAssetAliasReference(Base):
     created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)
     updated_at = Column(UtcDateTime, default=timezone.utcnow, onupdate=timezone.utcnow, nullable=False)
 
-    dataset_alias = relationship("AssetAliasModel", back_populates="consuming_dags")
-    dag = relationship("DagModel", back_populates="schedule_dataset_alias_references")
+    asset_alias = relationship("AssetAliasModel", back_populates="consuming_dags")
+    dag = relationship("DagModel", back_populates="schedule_asset_alias_references")
 
-    __tablename__ = "dag_schedule_dataset_alias_reference"
+    __tablename__ = "dag_schedule_asset_alias_reference"
     __table_args__ = (
-        PrimaryKeyConstraint(alias_id, dag_id, name="dsdar_pkey"),
+        PrimaryKeyConstraint(alias_id, dag_id, name="asaar_pkey"),
         ForeignKeyConstraint(
             (alias_id,),
-            ["dataset_alias.id"],
-            name="dsdar_dataset_alias_fkey",
+            ["asset_alias.id"],
+            name="dsaar_asset_alias_fkey",
             ondelete="CASCADE",
         ),
         ForeignKeyConstraint(
             columns=(dag_id,),
             refcolumns=["dag.dag_id"],
-            name="dsdar_dag_fkey",
+            name="dsaar_dag_fkey",
             ondelete="CASCADE",
         ),
-        Index("idx_dag_schedule_dataset_alias_reference_dag_id", dag_id),
+        Index("idx_dag_schedule_asset_alias_reference_dag_id", dag_id),
     )
 
     def __eq__(self, other):
@@ -344,104 +320,99 @@ def __hash__(self):
         return hash(self.__mapper__.primary_key)
 
     def __repr__(self):
-        args = []
-        for attr in [x.name for x in self.__mapper__.primary_key]:
-            args.append(f"{attr}={getattr(self, attr)!r}")
+        args = [f"{x.name}={getattr(self, x.name)!r}" for x in self.__mapper__.primary_key]
         return f"{self.__class__.__name__}({', '.join(args)})"
 
 
 class DagScheduleAssetReference(Base):
     """References from a DAG to an asset of which it is a consumer."""
 
-    dataset_id = Column(Integer, primary_key=True, nullable=False)
+    asset_id = Column(Integer, primary_key=True, nullable=False)
     dag_id = Column(StringID(), primary_key=True, nullable=False)
     created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)
     updated_at = Column(UtcDateTime, default=timezone.utcnow, onupdate=timezone.utcnow, nullable=False)
 
-    dataset = relationship("AssetModel", back_populates="consuming_dags")
-    dag = relationship("DagModel", back_populates="schedule_dataset_references")
+    asset = relationship("AssetModel", back_populates="consuming_dags")
+    dag = relationship("DagModel", back_populates="schedule_asset_references")
 
     queue_records = relationship(
         "AssetDagRunQueue",
         primaryjoin="""and_(
-            DagScheduleAssetReference.dataset_id == foreign(AssetDagRunQueue.dataset_id),
+            DagScheduleAssetReference.asset_id == foreign(AssetDagRunQueue.asset_id),
             DagScheduleAssetReference.dag_id == foreign(AssetDagRunQueue.target_dag_id),
         )""",
         cascade="all, delete, delete-orphan",
     )
 
-    __tablename__ = "dag_schedule_dataset_reference"
+    __tablename__ = "dag_schedule_asset_reference"
     __table_args__ = (
-        PrimaryKeyConstraint(dataset_id, dag_id, name="dsdr_pkey"),
+        PrimaryKeyConstraint(asset_id, dag_id, name="dsar_pkey"),
         ForeignKeyConstraint(
-            (dataset_id,),
-            ["dataset.id"],
-            name="dsdr_dataset_fkey",
+            (asset_id,),
+            ["asset.id"],
+            name="dsar_asset_fkey",
             ondelete="CASCADE",
         ),
         ForeignKeyConstraint(
             columns=(dag_id,),
             refcolumns=["dag.dag_id"],
-            name="dsdr_dag_id_fkey",
+            name="dsar_dag_id_fkey",
             ondelete="CASCADE",
         ),
-        Index("idx_dag_schedule_dataset_reference_dag_id", dag_id),
+        Index("idx_dag_schedule_asset_reference_dag_id", dag_id),
     )
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
-            return self.dataset_id == other.dataset_id and self.dag_id == other.dag_id
-        else:
-            return NotImplemented
+            return self.asset_id == other.asset_id and self.dag_id == other.dag_id
+        return NotImplemented
 
     def __hash__(self):
         return hash(self.__mapper__.primary_key)
 
     def __repr__(self):
-        args = []
-        for attr in [x.name for x in self.__mapper__.primary_key]:
-            args.append(f"{attr}={getattr(self, attr)!r}")
+        args = [f"{attr}={getattr(self, attr)!r}" for attr in [x.name for x in self.__mapper__.primary_key]]
         return f"{self.__class__.__name__}({', '.join(args)})"
 
 
 class TaskOutletAssetReference(Base):
     """References from a task to an asset that it updates / produces."""
 
-    dataset_id = Column(Integer, primary_key=True, nullable=False)
+    asset_id = Column(Integer, primary_key=True, nullable=False)
     dag_id = Column(StringID(), primary_key=True, nullable=False)
     task_id = Column(StringID(), primary_key=True, nullable=False)
     created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)
     updated_at = Column(UtcDateTime, default=timezone.utcnow, onupdate=timezone.utcnow, nullable=False)
 
-    dataset = relationship("AssetModel", back_populates="producing_tasks")
+    asset = relationship("AssetModel", back_populates="producing_tasks")
 
-    __tablename__ = "task_outlet_dataset_reference"
+    __tablename__ = "task_outlet_asset_reference"
     __table_args__ = (
         ForeignKeyConstraint(
-            (dataset_id,),
-            ["dataset.id"],
-            name="todr_dataset_fkey",
+            (asset_id,),
+            ["asset.id"],
+            name="toar_asset_fkey",
             ondelete="CASCADE",
         ),
-        PrimaryKeyConstraint(dataset_id, dag_id, task_id, name="todr_pkey"),
+        PrimaryKeyConstraint(asset_id, dag_id, task_id, name="toar_pkey"),
         ForeignKeyConstraint(
             columns=(dag_id,),
             refcolumns=["dag.dag_id"],
-            name="todr_dag_id_fkey",
+            name="toar_dag_id_fkey",
             ondelete="CASCADE",
         ),
-        Index("idx_task_outlet_dataset_reference_dag_id", dag_id),
+        Index("idx_task_outlet_asset_reference_dag_id", dag_id),
     )
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
             return (
-                self.dataset_id == other.dataset_id
+                self.asset_id == other.asset_id
                 and self.dag_id == other.dag_id
                 and self.task_id == other.task_id
             )
-        else:
-            return NotImplemented
+
+        return NotImplemented
 
     def __hash__(self):
         return hash(self.__mapper__.primary_key)
@@ -456,31 +427,32 @@ def __repr__(self):
 class AssetDagRunQueue(Base):
     """Model for storing asset events that need processing."""
 
-    dataset_id = Column(Integer, primary_key=True, nullable=False)
+    asset_id = Column(Integer, primary_key=True, nullable=False)
     target_dag_id = Column(StringID(), primary_key=True, nullable=False)
     created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False)
-    dataset = relationship("AssetModel", viewonly=True)
-    __tablename__ = "dataset_dag_run_queue"
+    asset = relationship("AssetModel", viewonly=True)
+
+    __tablename__ = "asset_dag_run_queue"
     __table_args__ = (
-        PrimaryKeyConstraint(dataset_id, target_dag_id, name="datasetdagrunqueue_pkey"),
+        PrimaryKeyConstraint(asset_id, target_dag_id, name="assetdagrunqueue_pkey"),
         ForeignKeyConstraint(
-            (dataset_id,),
-            ["dataset.id"],
-            name="ddrq_dataset_fkey",
+            (asset_id,),
+            ["asset.id"],
+            name="adrq_asset_fkey",
             ondelete="CASCADE",
         ),
         ForeignKeyConstraint(
             (target_dag_id,),
             ["dag.dag_id"],
-            name="ddrq_dag_fkey",
+            name="adrq_dag_fkey",
             ondelete="CASCADE",
         ),
-        Index("idx_dataset_dag_run_queue_target_dag_id", target_dag_id),
+        Index("idx_asset_dag_run_queue_target_dag_id", target_dag_id),
     )
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
-            return self.dataset_id == other.dataset_id and self.target_dag_id == other.target_dag_id
+            return self.asset_id == other.asset_id and self.target_dag_id == other.target_dag_id
         else:
             return NotImplemented
 
@@ -495,12 +467,12 @@ def __repr__(self):
 
 
 association_table = Table(
-    "dagrun_dataset_event",
+    "dagrun_asset_event",
     Base.metadata,
     Column("dag_run_id", ForeignKey("dag_run.id", ondelete="CASCADE"), primary_key=True),
-    Column("event_id", ForeignKey("dataset_event.id", ondelete="CASCADE"), primary_key=True),
-    Index("idx_dagrun_dataset_events_dag_run_id", "dag_run_id"),
-    Index("idx_dagrun_dataset_events_event_id", "event_id"),
+    Column("event_id", ForeignKey("asset_event.id", ondelete="CASCADE"), primary_key=True),
+    Index("idx_dagrun_asset_events_dag_run_id", "dag_run_id"),
+    Index("idx_dagrun_asset_events_event_id", "event_id"),
 )
 
 
@@ -508,7 +480,7 @@ class AssetEvent(Base):
     """
     A table to store assets events.
 
-    :param dataset_id: reference to AssetModel record
+    :param asset_id: reference to AssetModel record
     :param extra: JSON field for arbitrary extra info
     :param source_task_id: the task_id of the TI which updated the asset
     :param source_dag_id: the dag_id of the TI which updated the asset
@@ -521,7 +493,7 @@ class AssetEvent(Base):
     """
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    dataset_id = Column(Integer, nullable=False)
+    asset_id = Column(Integer, nullable=False)
     extra = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=False, default={})
     source_task_id = Column(StringID(), nullable=True)
     source_dag_id = Column(StringID(), nullable=True)
@@ -529,22 +501,22 @@ class AssetEvent(Base):
     source_map_index = Column(Integer, nullable=True, server_default=text("-1"))
     timestamp = Column(UtcDateTime, default=timezone.utcnow, nullable=False)
 
-    __tablename__ = "dataset_event"
+    __tablename__ = "asset_event"
     __table_args__ = (
-        Index("idx_dataset_id_timestamp", dataset_id, timestamp),
+        Index("idx_asset_id_timestamp", asset_id, timestamp),
         {"sqlite_autoincrement": True},  # ensures PK values not reused
     )
 
     created_dagruns = relationship(
         "DagRun",
         secondary=association_table,
-        backref="consumed_dataset_events",
+        backref="consumed_asset_events",
     )
 
     source_aliases = relationship(
         "AssetAliasModel",
-        secondary=dataset_alias_dataset_event_assocation_table,
-        back_populates="dataset_events",
+        secondary=asset_alias_asset_event_assocation_table,
+        back_populates="asset_events",
     )
 
     source_task_instance = relationship(
@@ -569,9 +541,9 @@ class AssetEvent(Base):
         lazy="select",
         uselist=False,
     )
-    dataset = relationship(
+    asset = relationship(
         AssetModel,
-        primaryjoin="AssetEvent.dataset_id == foreign(AssetModel.id)",
+        primaryjoin="AssetEvent.asset_id == foreign(AssetModel.id)",
         viewonly=True,
         lazy="select",
         uselist=False,
@@ -579,13 +551,13 @@ class AssetEvent(Base):
 
     @property
     def uri(self):
-        return self.dataset.uri
+        return self.asset.uri
 
     def __repr__(self) -> str:
         args = []
         for attr in [
             "id",
-            "dataset_id",
+            "asset_id",
             "extra",
             "source_task_id",
             "source_dag_id",
diff --git a/airflow/models/dag.py b/airflow/models/dag.py
index f0a7d7f56be2c..00943ec2ee262 100644
--- a/airflow/models/dag.py
+++ b/airflow/models/dag.py
@@ -268,12 +268,12 @@ def get_asset_triggered_next_run_info(
             .join(
                 ADRQ,
                 and_(
-                    ADRQ.dataset_id == DagScheduleAssetReference.dataset_id,
+                    ADRQ.asset_id == DagScheduleAssetReference.asset_id,
                     ADRQ.target_dag_id == DagScheduleAssetReference.dag_id,
                 ),
                 isouter=True,
             )
-            .join(AssetModel, AssetModel.id == DagScheduleAssetReference.dataset_id)
+            .join(AssetModel, AssetModel.id == DagScheduleAssetReference.asset_id)
             .group_by(DagScheduleAssetReference.dag_id)
             .where(DagScheduleAssetReference.dag_id.in_(dag_ids))
         ).all()
@@ -322,7 +322,7 @@ def _create_orm_dagrun(
     )
     # Load defaults into the following two fields to ensure result can be serialized detached
     run.log_template_id = int(session.scalar(select(func.max(LogTemplate.__table__.c.id))))
-    run.consumed_dataset_events = []
+    run.consumed_asset_events = []
     session.add(run)
     session.flush()
     run.dag = dag
@@ -376,7 +376,7 @@ class DAG(LoggingMixin):
 
     .. versionadded:: 2.4
         The *schedule* argument to specify either time-based scheduling logic
-        (timetable), or dataset-driven triggers.
+        (timetable), or asset-driven triggers.
 
     .. versionchanged:: 3.0
         The default value of *schedule* has been changed to *None* (no schedule).
@@ -2675,9 +2675,9 @@ def get_serialized_fields(cls):
         """Stringified DAGs and operators contain exactly these fields."""
         if not cls.__serialized_fields:
             exclusion_list = {
-                "schedule_dataset_references",
-                "schedule_dataset_alias_references",
-                "task_outlet_dataset_references",
+                "schedule_asset_references",
+                "schedule_asset_alias_references",
+                "task_outlet_asset_references",
                 "_old_context_manager_dags",
                 "safe_dag_id",
                 "last_loaded",
@@ -2842,8 +2842,8 @@ class DagModel(Base):
     timetable_summary = Column(Text, nullable=True)
     # Timetable description
     timetable_description = Column(String(1000), nullable=True)
-    # Dataset expression based on dataset triggers
-    dataset_expression = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
+    # Asset expression based on asset triggers
+    asset_expression = Column(sqlalchemy_jsonfield.JSONField(json=json), nullable=True)
     # Tags for view filter
     tags = relationship("DagTag", cascade="all, delete, delete-orphan", backref=backref("dag"))
     # Dag owner links for DAGs view
@@ -2870,18 +2870,18 @@ class DagModel(Base):
 
     __table_args__ = (Index("idx_next_dagrun_create_after", next_dagrun_create_after, unique=False),)
 
-    schedule_dataset_references = relationship(
+    schedule_asset_references = relationship(
         "DagScheduleAssetReference",
         back_populates="dag",
         cascade="all, delete, delete-orphan",
     )
-    schedule_dataset_alias_references = relationship(
+    schedule_asset_alias_references = relationship(
         "DagScheduleAssetAliasReference",
         back_populates="dag",
         cascade="all, delete, delete-orphan",
     )
-    schedule_datasets = association_proxy("schedule_dataset_references", "dataset")
-    task_outlet_dataset_references = relationship(
+    schedule_assets = association_proxy("schedule_asset_references", "asset")
+    task_outlet_asset_references = relationship(
         "TaskOutletAssetReference",
         cascade="all, delete, delete-orphan",
     )
@@ -3093,7 +3093,7 @@ def dag_ready(dag_id: str, cond: BaseAsset, statuses: dict) -> bool | None:
         del all_records
         dag_statuses = {}
         for dag_id, records in by_dag.items():
-            dag_statuses[dag_id] = {x.dataset.uri: True for x in records}
+            dag_statuses[dag_id] = {x.asset.uri: True for x in records}
         ser_dags = session.scalars(
             select(SerializedDagModel).where(SerializedDagModel.dag_id.in_(dag_statuses.keys()))
         ).all()
@@ -3105,27 +3105,27 @@ def dag_ready(dag_id: str, cond: BaseAsset, statuses: dict) -> bool | None:
                 del by_dag[dag_id]
                 del dag_statuses[dag_id]
         del dag_statuses
-        dataset_triggered_dag_info = {}
+        asset_triggered_dag_info = {}
         for dag_id, records in by_dag.items():
             times = sorted(x.created_at for x in records)
-            dataset_triggered_dag_info[dag_id] = (times[0], times[-1])
+            asset_triggered_dag_info[dag_id] = (times[0], times[-1])
         del by_dag
-        dataset_triggered_dag_ids = set(dataset_triggered_dag_info.keys())
-        if dataset_triggered_dag_ids:
+        asset_triggered_dag_ids = set(asset_triggered_dag_info.keys())
+        if asset_triggered_dag_ids:
             exclusion_list = set(
                 session.scalars(
                     select(DagModel.dag_id)
                     .join(DagRun.dag_model)
                     .where(DagRun.state.in_((DagRunState.QUEUED, DagRunState.RUNNING)))
-                    .where(DagModel.dag_id.in_(dataset_triggered_dag_ids))
+                    .where(DagModel.dag_id.in_(asset_triggered_dag_ids))
                     .group_by(DagModel.dag_id)
                     .having(func.count() >= func.max(DagModel.max_active_runs))
                 )
             )
             if exclusion_list:
-                dataset_triggered_dag_ids -= exclusion_list
-                dataset_triggered_dag_info = {
-                    k: v for k, v in dataset_triggered_dag_info.items() if k not in exclusion_list
+                asset_triggered_dag_ids -= exclusion_list
+                asset_triggered_dag_info = {
+                    k: v for k, v in asset_triggered_dag_info.items() if k not in exclusion_list
                 }
 
         # We limit so that _one_ scheduler doesn't try to do all the creation of dag runs
@@ -3137,7 +3137,7 @@ def dag_ready(dag_id: str, cond: BaseAsset, statuses: dict) -> bool | None:
                 cls.has_import_errors == expression.false(),
                 or_(
                     cls.next_dagrun_create_after <= func.now(),
-                    cls.dag_id.in_(dataset_triggered_dag_ids),
+                    cls.dag_id.in_(asset_triggered_dag_ids),
                 ),
             )
             .order_by(cls.next_dagrun_create_after)
@@ -3146,7 +3146,7 @@ def dag_ready(dag_id: str, cond: BaseAsset, statuses: dict) -> bool | None:
 
         return (
             session.scalars(with_row_locks(query, of=cls, session=session, skip_locked=True)),
-            dataset_triggered_dag_info,
+            asset_triggered_dag_info,
         )
 
     def calculate_dagrun_date_fields(
@@ -3186,7 +3186,7 @@ def calculate_dagrun_date_fields(
 
     @provide_session
     def get_asset_triggered_next_run_info(self, *, session=NEW_SESSION) -> dict[str, int | str] | None:
-        if self.dataset_expression is None:
+        if self.asset_expression is None:
             return None
 
         # When an asset alias does not resolve into assets, get_asset_triggered_next_run_info returns
diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py
index 20ec12b9915e7..5de0466a6be0e 100644
--- a/airflow/models/dagrun.py
+++ b/airflow/models/dagrun.py
@@ -91,7 +91,7 @@
 
     CreatedTasks = TypeVar("CreatedTasks", Iterator["dict[str, Any]"], Iterator[TI])
 
-RUN_ID_REGEX = r"^(?:manual|scheduled|dataset_triggered)__(?:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00)$"
+RUN_ID_REGEX = r"^(?:manual|scheduled|asset_triggered)__(?:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00)$"
 
 
 class TISchedulingDecision(NamedTuple):
diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
index 1dbe299f25b39..b5fcac30a9ad5 100644
--- a/airflow/models/taskinstance.py
+++ b/airflow/models/taskinstance.py
@@ -1086,11 +1086,11 @@ def get_triggering_events() -> dict[str, list[AssetEvent | AssetEventPydantic]]:
         nonlocal dag_run
         if dag_run not in session:
             dag_run = session.merge(dag_run, load=False)
-        asset_events = dag_run.consumed_dataset_events
+        asset_events = dag_run.consumed_asset_events
         triggering_events: dict[str, list[AssetEvent | AssetEventPydantic]] = defaultdict(list)
         for event in asset_events:
-            if event.dataset:
-                triggering_events[event.dataset.uri].append(event)
+            if event.asset:
+                triggering_events[event.asset.uri].append(event)
 
         return triggering_events
 
@@ -2911,22 +2911,22 @@ def _register_asset_changes(self, *, events: OutletEventAccessors, session: Sess
                     frozen_extra = frozenset(asset_alias_event["extra"].items())
                     asset_alias_names[(asset_uri, frozen_extra)].add(asset_alias_name)
 
-        dataset_models: dict[str, AssetModel] = {
-            dataset_obj.uri: dataset_obj
-            for dataset_obj in session.scalars(
+        asset_models: dict[str, AssetModel] = {
+            asset_obj.uri: asset_obj
+            for asset_obj in session.scalars(
                 select(AssetModel).where(AssetModel.uri.in_(uri for uri, _ in asset_alias_names))
             )
         }
-        if missing_datasets := [Asset(uri=u) for u, _ in asset_alias_names if u not in dataset_models]:
-            dataset_models.update(
-                (dataset_obj.uri, dataset_obj)
-                for dataset_obj in asset_manager.create_assets(missing_datasets, session=session)
+        if missing_assets := [Asset(uri=u) for u, _ in asset_alias_names if u not in asset_models]:
+            asset_models.update(
+                (asset_obj.uri, asset_obj)
+                for asset_obj in asset_manager.create_assets(missing_assets, session=session)
             )
-            self.log.warning("Created new datasets for alias reference: %s", missing_datasets)
+            self.log.warning("Created new assets for alias reference: %s", missing_assets)
             session.flush()  # Needed because we need the id for fk.
 
         for (uri, extra_items), alias_names in asset_alias_names.items():
-            asset_obj = dataset_models[uri]
+            asset_obj = asset_models[uri]
             self.log.info(
                 'Creating event for %r through aliases "%s"',
                 asset_obj,
@@ -2935,7 +2935,7 @@ def _register_asset_changes(self, *, events: OutletEventAccessors, session: Sess
             asset_manager.register_asset_change(
                 task_instance=self,
                 asset=asset_obj,
-                aliases=[AssetAlias(name) for name in alias_names],
+                aliases=[AssetAlias(name=name) for name in alias_names],
                 extra=dict(extra_items),
                 session=session,
                 source_alias_names=alias_names,
diff --git a/airflow/serialization/pydantic/asset.py b/airflow/serialization/pydantic/asset.py
index 4cd264902091a..611730dd92e47 100644
--- a/airflow/serialization/pydantic/asset.py
+++ b/airflow/serialization/pydantic/asset.py
@@ -23,7 +23,7 @@
 class DagScheduleAssetReferencePydantic(BaseModelPydantic):
     """Serializable version of the DagScheduleAssetReference ORM SqlAlchemyModel used by internal API."""
 
-    dataset_id: int
+    asset_id: int
     dag_id: str
     created_at: datetime
     updated_at: datetime
@@ -34,7 +34,7 @@ class DagScheduleAssetReferencePydantic(BaseModelPydantic):
 class TaskOutletAssetReferencePydantic(BaseModelPydantic):
     """Serializable version of the TaskOutletAssetReference ORM SqlAlchemyModel used by internal API."""
 
-    dataset_id: int
+    asset_id: int
     dag_id: str
     task_id: str
     created_at: datetime
@@ -62,13 +62,13 @@ class AssetEventPydantic(BaseModelPydantic):
     """Serializable representation of the AssetEvent ORM SqlAlchemyModel used by internal API."""
 
     id: int
-    dataset_id: Optional[int]
+    asset_id: Optional[int]
     extra: dict
     source_task_id: Optional[str]
     source_dag_id: Optional[str]
     source_run_id: Optional[str]
     source_map_index: Optional[int]
     timestamp: datetime
-    dataset: Optional[AssetPydantic]
+    asset: Optional[AssetPydantic]
 
     model_config = ConfigDict(from_attributes=True, arbitrary_types_allowed=True)
diff --git a/airflow/serialization/pydantic/dag_run.py b/airflow/serialization/pydantic/dag_run.py
index 86857452e8310..fd12ca12c0184 100644
--- a/airflow/serialization/pydantic/dag_run.py
+++ b/airflow/serialization/pydantic/dag_run.py
@@ -55,7 +55,7 @@ class DagRunPydantic(BaseModelPydantic):
     dag_hash: Optional[str]
     updated_at: Optional[datetime]
     dag: Optional[PydanticDag]
-    consumed_dataset_events: List[AssetEventPydantic]  # noqa: UP006
+    consumed_asset_events: List[AssetEventPydantic]  # noqa: UP006
     log_template_id: Optional[int]
     triggered_by: Optional[DagRunTriggeredByType]
 
diff --git a/airflow/serialization/serialized_objects.py b/airflow/serialization/serialized_objects.py
index 9f180c2a5deac..14528f62bddf1 100644
--- a/airflow/serialization/serialized_objects.py
+++ b/airflow/serialization/serialized_objects.py
@@ -265,7 +265,7 @@ def encode_asset_condition(var: BaseAsset) -> dict[str, Any]:
 
 def decode_asset_condition(var: dict[str, Any]) -> BaseAsset:
     """
-    Decode a previously serialized dataset condition.
+    Decode a previously serialized asset condition.
 
     :meta private:
     """
@@ -740,8 +740,8 @@ def serialize(
         elif isinstance(var, LazySelectSequence):
             return cls.serialize(list(var))
         elif isinstance(var, BaseAsset):
-            serialized_dataset = encode_asset_condition(var)
-            return cls._encode(serialized_dataset, type_=serialized_dataset.pop("__type"))
+            serialized_asset = encode_asset_condition(var)
+            return cls._encode(serialized_asset, type_=serialized_asset.pop("__type"))
         elif isinstance(var, SimpleTaskInstance):
             return cls._encode(
                 cls.serialize(var.__dict__, strict=strict, use_pydantic_models=use_pydantic_models),
diff --git a/airflow/timetables/assets.py b/airflow/timetables/assets.py
index b158555590ad5..d69a8e4d80cc0 100644
--- a/airflow/timetables/assets.py
+++ b/airflow/timetables/assets.py
@@ -92,6 +92,6 @@ def next_dagrun_info(
         )
 
     def generate_run_id(self, *, run_type: DagRunType, **kwargs: typing.Any) -> str:
-        if run_type != DagRunType.DATASET_TRIGGERED:
+        if run_type != DagRunType.ASSET_TRIGGERED:
             return self.timetable.generate_run_id(run_type=run_type, **kwargs)
         return super().generate_run_id(run_type=run_type, **kwargs)
diff --git a/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow/ui/openapi-gen/requests/schemas.gen.ts
index aa6437118eeea..79a55e7b08dcc 100644
--- a/airflow/ui/openapi-gen/requests/schemas.gen.ts
+++ b/airflow/ui/openapi-gen/requests/schemas.gen.ts
@@ -383,7 +383,7 @@ export const $DAGDetailsResponse = {
       ],
       title: "Dag Run Timeout",
     },
-    dataset_expression: {
+    asset_expression: {
       anyOf: [
         {
           type: "object",
@@ -392,7 +392,7 @@ export const $DAGDetailsResponse = {
           type: "null",
         },
       ],
-      title: "Dataset Expression",
+      title: "Asset Expression",
     },
     doc_md: {
       anyOf: [
@@ -538,7 +538,7 @@ export const $DAGDetailsResponse = {
     "owners",
     "catchup",
     "dag_run_timeout",
-    "dataset_expression",
+    "asset_expression",
     "doc_md",
     "start_date",
     "end_date",
@@ -1002,13 +1002,13 @@ export const $DAGRunTypes = {
       type: "integer",
       title: "Manual",
     },
-    dataset_triggered: {
+    asset_triggered: {
       type: "integer",
-      title: "Dataset Triggered",
+      title: "Asset Triggered",
     },
   },
   type: "object",
-  required: ["backfill", "scheduled", "manual", "dataset_triggered"],
+  required: ["backfill", "scheduled", "manual", "asset_triggered"],
   title: "DAGRunTypes",
   description: "DAG Run Types for responses.",
 } as const;
@@ -1093,7 +1093,7 @@ export const $DagRunTriggeredByType = {
 
 export const $DagRunType = {
   type: "string",
-  enum: ["backfill", "scheduled", "manual", "dataset_triggered"],
+  enum: ["backfill", "scheduled", "manual", "asset_triggered"],
   title: "DagRunType",
   description: "Class with DagRun types.",
 } as const;
diff --git a/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow/ui/openapi-gen/requests/types.gen.ts
index c795fce3e540d..83030dfb0d168 100644
--- a/airflow/ui/openapi-gen/requests/types.gen.ts
+++ b/airflow/ui/openapi-gen/requests/types.gen.ts
@@ -68,7 +68,7 @@ export type DAGDetailsResponse = {
   owners: Array<string>;
   catchup: boolean;
   dag_run_timeout: string | null;
-  dataset_expression: {
+  asset_expression: {
     [key: string]: unknown;
   } | null;
   doc_md: string | null;
@@ -174,7 +174,7 @@ export type DAGRunTypes = {
   backfill: number;
   scheduled: number;
   manual: number;
-  dataset_triggered: number;
+  asset_triggered: number;
 };
 
 /**
@@ -222,7 +222,7 @@ export type DagRunType =
   | "backfill"
   | "scheduled"
   | "manual"
-  | "dataset_triggered";
+  | "asset_triggered";
 
 /**
  * Serializable representation of the DagTag ORM SqlAlchemyModel used by internal API.
diff --git a/airflow/utils/context.py b/airflow/utils/context.py
index 4f308a6f9e060..9af1486f914e0 100644
--- a/airflow/utils/context.py
+++ b/airflow/utils/context.py
@@ -283,7 +283,7 @@ def __getitem__(self, key: int | str | Asset | AssetAlias) -> LazyAssetEventSele
             where_clause = AssetAliasModel.name == asset_alias.name
         elif isinstance(obj, (Asset, str)):
             asset = self._assets[extract_event_key(obj)]
-            join_clause = AssetEvent.dataset
+            join_clause = AssetEvent.asset
             where_clause = AssetModel.uri == asset.uri
         else:
             raise ValueError(key)
diff --git a/airflow/utils/db.py b/airflow/utils/db.py
index d6a367c4d91fe..8579be74ff4bd 100644
--- a/airflow/utils/db.py
+++ b/airflow/utils/db.py
@@ -96,7 +96,7 @@ class MappedClassProtocol(Protocol):
     "2.9.0": "1949afb29106",
     "2.9.2": "686269002441",
     "2.10.0": "22ed7efa9da2",
-    "3.0.0": "3a8972ecb8f9",
+    "3.0.0": "05234396c6fc",
 }
 
 
diff --git a/airflow/utils/db_cleanup.py b/airflow/utils/db_cleanup.py
index f98ef40c0af63..4fc387617be87 100644
--- a/airflow/utils/db_cleanup.py
+++ b/airflow/utils/db_cleanup.py
@@ -108,7 +108,7 @@ def readable_config(self):
         keep_last_filters=[column("external_trigger") == false()],
         keep_last_group_by=["dag_id"],
     ),
-    _TableConfig(table_name="dataset_event", recency_column_name="timestamp"),
+    _TableConfig(table_name="asset_event", recency_column_name="timestamp"),
     _TableConfig(table_name="import_error", recency_column_name="timestamp"),
     _TableConfig(table_name="log", recency_column_name="dttm"),
     _TableConfig(table_name="sla_miss", recency_column_name="timestamp"),
diff --git a/airflow/utils/types.py b/airflow/utils/types.py
index 80ee1d644d4d2..e012d9f1963cb 100644
--- a/airflow/utils/types.py
+++ b/airflow/utils/types.py
@@ -86,7 +86,7 @@ class DagRunType(str, enum.Enum):
     BACKFILL_JOB = "backfill"
     SCHEDULED = "scheduled"
     MANUAL = "manual"
-    DATASET_TRIGGERED = "dataset_triggered"
+    ASSET_TRIGGERED = "asset_triggered"
 
     def __str__(self) -> str:
         return self.value
@@ -118,5 +118,5 @@ class DagRunTriggeredByType(enum.Enum):
     UI = "ui"  # for clicking the `Trigger DAG` button
     TEST = "test"  # for dag.test()
     TIMETABLE = "timetable"  # for timetable based triggering
-    DATASET = "dataset"  # for dataset_triggered run type
+    DATASET = "dataset"  # for asset_triggered run type
     BACKFILL = "backfill"
diff --git a/airflow/www/jest-setup.js b/airflow/www/jest-setup.js
index ecf79db5cb19f..0c5ebf5c67586 100644
--- a/airflow/www/jest-setup.js
+++ b/airflow/www/jest-setup.js
@@ -61,7 +61,7 @@ global.defaultDagRunDisplayNumber = 245;
 global.filtersOptions = {
   // Must stay in sync with airflow/www/static/js/types/index.ts
   dagStates: ["success", "running", "queued", "failed"],
-  runTypes: ["manual", "backfill", "scheduled", "dataset_triggered"],
+  runTypes: ["manual", "backfill", "scheduled", "asset_triggered"],
 };
 
 global.moment = moment;
diff --git a/airflow/www/static/js/cluster-activity/index.test.tsx b/airflow/www/static/js/cluster-activity/index.test.tsx
index 3381a5be87325..4a162e12bdf7e 100644
--- a/airflow/www/static/js/cluster-activity/index.test.tsx
+++ b/airflow/www/static/js/cluster-activity/index.test.tsx
@@ -37,7 +37,7 @@ const mockHistoricalMetricsData = {
   dag_run_states: { failed: 0, queued: 0, running: 0, success: 306 },
   dag_run_types: {
     backfill: 0,
-    dataset_triggered: 0,
+    asset_triggered: 0,
     manual: 14,
     scheduled: 292,
   },
diff --git a/airflow/www/static/js/components/DatasetEventCard.tsx b/airflow/www/static/js/components/DatasetEventCard.tsx
index 9dd1ee91e3731..d3931bf3c1de9 100644
--- a/airflow/www/static/js/components/DatasetEventCard.tsx
+++ b/airflow/www/static/js/components/DatasetEventCard.tsx
@@ -69,7 +69,7 @@ const DatasetEventCard = ({
     <Box>
       <Grid
         templateColumns="repeat(4, 1fr)"
-        key={`${assetEvent.datasetId}-${assetEvent.timestamp}`}
+        key={`${assetEvent.assetId}-${assetEvent.timestamp}`}
         _hover={{ bg: "gray.50" }}
         transition="background-color 0.2s"
         p={2}
@@ -81,18 +81,18 @@ const DatasetEventCard = ({
           <Time dateTime={assetEvent.timestamp} />
           <Flex alignItems="center">
             <HiDatabase size="16px" />
-            {assetEvent.datasetUri && assetEvent.datasetUri !== selectedUri ? (
+            {assetEvent.assetUri && assetEvent.assetUri !== selectedUri ? (
               <Link
                 color="blue.600"
                 ml={2}
                 href={`${datasetsUrl}?uri=${encodeURIComponent(
-                  assetEvent.datasetUri
+                  assetEvent.assetUri
                 )}`}
               >
-                {assetEvent.datasetUri}
+                {assetEvent.assetUri}
               </Link>
             ) : (
-              <Text ml={2}>{assetEvent.datasetUri}</Text>
+              <Text ml={2}>{assetEvent.assetUri}</Text>
             )}
           </Flex>
         </GridItem>
diff --git a/airflow/www/static/js/components/RunTypeIcon.tsx b/airflow/www/static/js/components/RunTypeIcon.tsx
index 19e59babd3157..5d5be01663385 100644
--- a/airflow/www/static/js/components/RunTypeIcon.tsx
+++ b/airflow/www/static/js/components/RunTypeIcon.tsx
@@ -42,7 +42,7 @@ const DagRunTypeIcon = ({ runType, ...rest }: Props) => {
       return <RiArrowGoBackFill style={iconStyle} {...rest} />;
     case "scheduled":
       return <MdOutlineSchedule style={iconStyle} {...rest} />;
-    case "dataset_triggered":
+    case "asset_triggered":
       return <HiDatabase style={iconStyle} {...rest} />;
     default:
       return null;
diff --git a/airflow/www/static/js/dag/details/Header.tsx b/airflow/www/static/js/dag/details/Header.tsx
index 172443ca47b36..f881a48213b9d 100644
--- a/airflow/www/static/js/dag/details/Header.tsx
+++ b/airflow/www/static/js/dag/details/Header.tsx
@@ -66,7 +66,7 @@ const Header = ({ mapIndex }: Props) => {
       runId.includes("manual__") ||
       runId.includes("scheduled__") ||
       runId.includes("backfill__") ||
-      runId.includes("dataset_triggered__") ? (
+      runId.includes("asset_triggered__") ? (
         <Time dateTime={getDagRunLabel({ dagRun })} />
       ) : (
         runId
diff --git a/airflow/www/static/js/dag/details/dag/Dag.tsx b/airflow/www/static/js/dag/details/dag/Dag.tsx
index 9643064d2a3b1..cd14ed2cd42fe 100644
--- a/airflow/www/static/js/dag/details/dag/Dag.tsx
+++ b/airflow/www/static/js/dag/details/dag/Dag.tsx
@@ -242,14 +242,14 @@ const Dag = () => {
                 </Td>
                 <Td />
               </Tr>
-              {!!dagDetailsData.datasetExpression && (
+              {!!dagDetailsData.assetExpression && (
                 <Tr>
                   <Td>Dataset Conditions</Td>
                   <Td>
                     <Code>
                       <pre>
                         {JSON.stringify(
-                          dagDetailsData.datasetExpression,
+                          dagDetailsData.assetExpression,
                           null,
                           2
                         )}
diff --git a/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx b/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx
index 6deedb073e8d9..0b9d34af1f1e8 100644
--- a/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx
+++ b/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx
@@ -52,7 +52,7 @@ const DatasetTriggerEvents = ({ runId }: Props) => {
       },
       {
         Header: "Dataset",
-        accessor: "datasetUri",
+        accessor: "assetUri",
       },
       {
         Header: "Source Task Instance",
diff --git a/airflow/www/static/js/dag/details/dagRun/index.tsx b/airflow/www/static/js/dag/details/dagRun/index.tsx
index 05679a598faa9..97ad33dcb86ce 100644
--- a/airflow/www/static/js/dag/details/dagRun/index.tsx
+++ b/airflow/www/static/js/dag/details/dagRun/index.tsx
@@ -58,9 +58,7 @@ const DagRun = ({ runId }: Props) => {
         initialValue={note}
         key={dagId + runId}
       />
-      {runType === "dataset_triggered" && (
-        <DatasetTriggerEvents runId={runId} />
-      )}
+      {runType === "asset_triggered" && <DatasetTriggerEvents runId={runId} />}
       <DagRunDetails run={run} />
     </Box>
   );
diff --git a/airflow/www/static/js/dag/details/graph/index.tsx b/airflow/www/static/js/dag/details/graph/index.tsx
index b9511b6664181..2236c3e37b074 100644
--- a/airflow/www/static/js/dag/details/graph/index.tsx
+++ b/airflow/www/static/js/dag/details/graph/index.tsx
@@ -58,13 +58,13 @@ interface Props {
 
 const dagId = getMetaValue("dag_id");
 
-type DatasetExpression = {
-  all?: (string | DatasetExpression)[];
-  any?: (string | DatasetExpression)[];
+type AssetExpression = {
+  all?: (string | AssetExpression)[];
+  any?: (string | AssetExpression)[];
 };
 
 const getUpstreamDatasets = (
-  datasetExpression: DatasetExpression,
+  assetExpression: AssetExpression,
   firstChildId: string,
   level = 0
 ) => {
@@ -72,16 +72,16 @@ const getUpstreamDatasets = (
   let nodes: DepNode[] = [];
   let type: DepNode["value"]["class"] | undefined;
   const datasetIds: string[] = [];
-  let nestedExpression: DatasetExpression | undefined;
-  if (datasetExpression?.any) {
+  let nestedExpression: AssetExpression | undefined;
+  if (assetExpression?.any) {
     type = "or-gate";
-    datasetExpression.any.forEach((de) => {
+    assetExpression.any.forEach((de) => {
       if (typeof de === "string") datasetIds.push(de);
       else nestedExpression = de;
     });
-  } else if (datasetExpression?.all) {
+  } else if (assetExpression?.all) {
     type = "and-gate";
-    datasetExpression.all.forEach((de) => {
+    assetExpression.all.forEach((de) => {
       if (typeof de === "string") datasetIds.push(de);
       else nestedExpression = de;
     });
@@ -159,7 +159,7 @@ const Graph = ({ openGroupIds, onToggleGroups, hoveredTaskState }: Props) => {
 
   const { nodes: upstreamDatasetNodes, edges: upstreamDatasetEdges } =
     getUpstreamDatasets(
-      dagDetails.datasetExpression as DatasetExpression,
+      dagDetails.assetExpression as AssetExpression,
       data?.nodes?.children?.[0]?.id ?? ""
     );
 
@@ -212,17 +212,17 @@ const Graph = ({ openGroupIds, onToggleGroups, hoveredTaskState }: Props) => {
 
     // Check if there is a dataset event even though we did not find a dataset
     downstreamAssetEvents.forEach((de) => {
-      const hasNode = datasetNodes.find((node) => node.id === de.datasetUri);
-      if (!hasNode && de.sourceTaskId && de.datasetUri) {
+      const hasNode = datasetNodes.find((node) => node.id === de.assetUri);
+      if (!hasNode && de.sourceTaskId && de.assetUri) {
         datasetEdges.push({
           sourceId: de.sourceTaskId,
-          targetId: de.datasetUri,
+          targetId: de.assetUri,
         });
         datasetNodes.push({
-          id: de.datasetUri,
+          id: de.assetUri,
           value: {
             class: "asset",
-            label: de.datasetUri,
+            label: de.assetUri,
           },
         });
       }
diff --git a/airflow/www/static/js/dag/details/graph/utils.ts b/airflow/www/static/js/dag/details/graph/utils.ts
index d548b57d85466..c15dc6dcf0ce6 100644
--- a/airflow/www/static/js/dag/details/graph/utils.ts
+++ b/airflow/www/static/js/dag/details/graph/utils.ts
@@ -93,7 +93,7 @@ export const flattenNodes = ({
         },
         assetEvent:
           node.value.class === "asset"
-            ? assetEvents?.find((de) => de.datasetUri === node.value.label)
+            ? assetEvents?.find((de) => de.assetUri === node.value.label)
             : undefined,
         ...node.value,
       },
diff --git a/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx b/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx
index 110f462b69386..7d01794bfc0ac 100644
--- a/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx
+++ b/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx
@@ -55,7 +55,7 @@ const DatasetUpdateEvents = ({ runId, taskId }: Props) => {
       },
       {
         Header: "Dataset",
-        accessor: "datasetUri",
+        accessor: "assetUri",
       },
       {
         Header: "Triggered Runs",
diff --git a/airflow/www/static/js/datasetUtils.js b/airflow/www/static/js/datasetUtils.js
index 5ba5e3fe584fa..92d1a5c705f88 100644
--- a/airflow/www/static/js/datasetUtils.js
+++ b/airflow/www/static/js/datasetUtils.js
@@ -23,13 +23,13 @@ import { getMetaValue } from "./utils";
 
 export function openDatasetModal(dagId, summary, nextDatasets, error) {
   const assetEvents = nextDatasets.events || [];
-  const expression = nextDatasets.dataset_expression;
+  const expression = nextDatasets.asset_expression;
   const datasetsUrl = getMetaValue("datasets_url");
-  $("#dataset_expression").empty();
+  $("#asset_expression").empty();
   $("#datasets_tbody").empty();
   $("#datasets_error").hide();
   $("#dag_id").text(dagId);
-  $("#dataset_expression").text(JSON.stringify(expression, null, 2));
+  $("#asset_expression").text(JSON.stringify(expression, null, 2));
   $("#datasetNextRunModal").modal({});
   if (summary) $("#next_run_summary").text(summary);
   assetEvents.forEach((d) => {
diff --git a/airflow/www/static/js/datasets/AssetEvents.tsx b/airflow/www/static/js/datasets/AssetEvents.tsx
index ccddf4ace885d..60aed55196f53 100644
--- a/airflow/www/static/js/datasets/AssetEvents.tsx
+++ b/airflow/www/static/js/datasets/AssetEvents.tsx
@@ -65,7 +65,7 @@ const Events = ({ assetId, showLabel }: Props) => {
       },
       {
         Header: "Dataset",
-        accessor: "datasetUri",
+        accessor: "assetUri",
       },
       {
         Header: "Source Task Instance",
diff --git a/airflow/www/static/js/types/api-generated.ts b/airflow/www/static/js/types/api-generated.ts
index ef45dbd3b57b6..31b91600573f8 100644
--- a/airflow/www/static/js/types/api-generated.ts
+++ b/airflow/www/static/js/types/api-generated.ts
@@ -267,6 +267,7 @@ export interface paths {
      * Get asset for a dag run.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/dagRuns/{dag_run_id}/upstreamDatasetEvents"
      */
     get: operations["get_upstream_asset_events"];
     parameters: {
@@ -299,19 +300,25 @@ export interface paths {
      * Get a queued asset event for a DAG.
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
      */
     get: operations["get_dag_asset_queued_event"];
     /**
      * Delete a queued Asset event for a DAG.
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
      */
     delete: operations["delete_dag_asset_queued_event"];
     parameters: {
       path: {
         /** The DAG ID. */
         dag_id: components["parameters"]["DAGID"];
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
     };
@@ -321,12 +328,14 @@ export interface paths {
      * Get queued Asset events for a DAG.
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
      */
     get: operations["get_dag_asset_queued_events"];
     /**
      * Delete queued Asset events for a DAG.
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
      */
     delete: operations["delete_dag_asset_queued_events"];
     parameters: {
@@ -355,17 +364,23 @@ export interface paths {
      * Get queued Asset events for an Asset
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
      */
     get: operations["get_asset_queued_events"];
     /**
      * Delete queued Asset events for a Asset.
      *
      * *New in version 2.9.0*
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
      */
     delete: operations["delete_asset_queued_events"];
     parameters: {
       path: {
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
     };
@@ -783,22 +798,39 @@ export interface paths {
     get: operations["get_dag_warnings"];
   };
   "/assets": {
+    /** *Changed in 3.0.0*: The endpoint value was renamed from "/datasets" */
     get: operations["get_assets"];
   };
   "/assets/{uri}": {
-    /** Get an asset by uri. */
+    /**
+     * Get an asset by uri.
+     *
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/{uri}"
+     */
     get: operations["get_asset"];
     parameters: {
       path: {
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
     };
   };
   "/assets/events": {
-    /** Get asset events */
+    /**
+     * Get asset events
+     *
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
+     */
     get: operations["get_asset_events"];
-    /** Create asset event */
+    /**
+     * Create asset event
+     *
+     * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
+     */
     post: operations["create_asset_event"];
   };
   "/config": {
@@ -1193,8 +1225,12 @@ export interface components {
       data_interval_end?: string | null;
       /** Format: date-time */
       last_scheduling_decision?: string | null;
-      /** @enum {string} */
-      run_type?: "backfill" | "manual" | "scheduled" | "dataset_triggered";
+      /**
+       * @description *Changed in 3.0.0*: The asset_triggered value was renamed from dataset_triggered.
+       *
+       * @enum {string}
+       */
+      run_type?: "backfill" | "manual" | "scheduled" | "asset_triggered";
       state?: components["schemas"]["DagState"];
       external_trigger?: boolean;
       /**
@@ -1647,8 +1683,12 @@ export interface components {
        */
       start_date?: string | null;
       dag_run_timeout?: components["schemas"]["TimeDelta"] | null;
-      /** @description Nested asset any/all conditions */
-      dataset_expression?: { [key: string]: unknown } | null;
+      /**
+       * @description Nested asset any/all conditions
+       *
+       * *Changed in 3.0.0*: The asset_expression value was renamed from dataset_expression.
+       */
+      asset_expression?: { [key: string]: unknown } | null;
       doc_md?: string | null;
       default_view?: string | null;
       /**
@@ -1852,6 +1892,7 @@ export interface components {
      * @description An asset item.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from Dataset.
      */
     Asset: {
       /** @description The asset id */
@@ -1871,6 +1912,7 @@ export interface components {
      * @description An asset reference to an upstream task.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from TaskOutletDatasetReference.
      */
     TaskOutletAssetReference: {
       /** @description The DAG ID that updates the asset. */
@@ -1886,6 +1928,7 @@ export interface components {
      * @description An asset reference to a downstream DAG.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from DagScheduleDatasetReference.
      */
     DagScheduleAssetReference: {
       /** @description The DAG ID that depends on the asset. */
@@ -1899,20 +1942,31 @@ export interface components {
      * @description A collection of assets.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from DatasetCollection.
      */
     AssetCollection: {
+      /** @description *Changed in 3.0.0*: This was renamed from datasets. */
       assets?: components["schemas"]["Asset"][];
     } & components["schemas"]["CollectionInfo"];
     /**
      * @description An asset event.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from DatasetEvent.
      */
     AssetEvent: {
-      /** @description The asset id */
-      dataset_id?: number;
-      /** @description The URI of the asset */
-      dataset_uri?: string;
+      /**
+       * @description The asset id
+       *
+       * *Changed in 3.0.0*: This was renamed from dataset_id.
+       */
+      asset_id?: number;
+      /**
+       * @description The URI of the asset
+       *
+       * *Changed in 3.0.0*: This was renamed from dataset_uri.
+       */
+      asset_uri?: string;
       /** @description The asset event extra */
       extra?: { [key: string]: unknown } | null;
       /** @description The DAG ID that updated the asset. */
@@ -1927,8 +1981,13 @@ export interface components {
       /** @description The asset event creation time */
       timestamp?: string;
     };
+    /** @description *Changed in 3.0.0*: This was renamed from CreateDatasetEvent. */
     CreateAssetEvent: {
-      /** @description The URI of the asset */
+      /**
+       * @description The URI of the asset
+       *
+       * *Changed in 3.0.0*: This was renamed from dataset_uri.
+       */
       asset_uri: string;
       /** @description The asset event extra */
       extra?: { [key: string]: unknown } | null;
@@ -1988,8 +2047,10 @@ export interface components {
      * @description A collection of asset events.
      *
      * *New in version 2.4.0*
+     * *Changed in 3.0.0*: This was renamed from DatasetEventCollection.
      */
     AssetEventCollection: {
+      /** @description *Changed in 3.0.0*: This was renamed from dataset_events. */
       asset_events?: components["schemas"]["AssetEvent"][];
     } & components["schemas"]["CollectionInfo"];
     /** @description The option of configuration. */
@@ -2543,7 +2604,11 @@ export interface components {
     EventLogID: number;
     /** @description The import error ID. */
     ImportErrorID: number;
-    /** @description The encoded Asset URI */
+    /**
+     * @description The encoded Asset URI
+     *
+     * *Changed in 3.0.0*: This was renamed from DatasetURI.
+     */
     AssetURI: string;
     /** @description The pool name. */
     PoolName: string;
@@ -2623,7 +2688,11 @@ export interface components {
      * *New in version 2.2.0*
      */
     FilterTags: string[];
-    /** @description The Asset ID that updated the asset. */
+    /**
+     * @description The Asset ID that updated the asset.
+     *
+     * *Changed in 3.0.0*: This was renamed from FilterDatasetID.
+     */
     FilterAssetID: number;
     /** @description The DAG ID that updated the asset. */
     FilterSourceDAGID: string;
@@ -3585,6 +3654,7 @@ export interface operations {
    * Get asset for a dag run.
    *
    * *New in version 2.4.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/dagRuns/{dag_run_id}/upstreamDatasetEvents"
    */
   get_upstream_asset_events: {
     parameters: {
@@ -3644,13 +3714,18 @@ export interface operations {
    * Get a queued asset event for a DAG.
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
    */
   get_dag_asset_queued_event: {
     parameters: {
       path: {
         /** The DAG ID. */
         dag_id: components["parameters"]["DAGID"];
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
       query: {
@@ -3674,13 +3749,18 @@ export interface operations {
    * Delete a queued Asset event for a DAG.
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent/{uri}"
    */
   delete_dag_asset_queued_event: {
     parameters: {
       path: {
         /** The DAG ID. */
         dag_id: components["parameters"]["DAGID"];
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
       query: {
@@ -3701,6 +3781,7 @@ export interface operations {
    * Get queued Asset events for a DAG.
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
    */
   get_dag_asset_queued_events: {
     parameters: {
@@ -3729,6 +3810,7 @@ export interface operations {
    * Delete queued Asset events for a DAG.
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/dags/{dag_id}/datasets/queuedEvent"
    */
   delete_dag_asset_queued_events: {
     parameters: {
@@ -3774,11 +3856,16 @@ export interface operations {
    * Get queued Asset events for an Asset
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
    */
   get_asset_queued_events: {
     parameters: {
       path: {
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
       query: {
@@ -3802,11 +3889,16 @@ export interface operations {
    * Delete queued Asset events for a Asset.
    *
    * *New in version 2.9.0*
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/assets/queuedEvent/{uri}"
    */
   delete_asset_queued_events: {
     parameters: {
       path: {
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
       query: {
@@ -5040,6 +5132,7 @@ export interface operations {
       403: components["responses"]["PermissionDenied"];
     };
   };
+  /** *Changed in 3.0.0*: The endpoint value was renamed from "/datasets" */
   get_assets: {
     parameters: {
       query: {
@@ -5075,11 +5168,19 @@ export interface operations {
       403: components["responses"]["PermissionDenied"];
     };
   };
-  /** Get an asset by uri. */
+  /**
+   * Get an asset by uri.
+   *
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/{uri}"
+   */
   get_asset: {
     parameters: {
       path: {
-        /** The encoded Asset URI */
+        /**
+         * The encoded Asset URI
+         *
+         * *Changed in 3.0.0*: This was renamed from DatasetURI.
+         */
         uri: components["parameters"]["AssetURI"];
       };
     };
@@ -5095,7 +5196,11 @@ export interface operations {
       404: components["responses"]["NotFound"];
     };
   };
-  /** Get asset events */
+  /**
+   * Get asset events
+   *
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
+   */
   get_asset_events: {
     parameters: {
       query: {
@@ -5110,7 +5215,11 @@ export interface operations {
          * *New in version 2.1.0*
          */
         order_by?: components["parameters"]["OrderBy"];
-        /** The Asset ID that updated the asset. */
+        /**
+         * The Asset ID that updated the asset.
+         *
+         * *Changed in 3.0.0*: This was renamed from FilterDatasetID.
+         */
         asset_id?: components["parameters"]["FilterAssetID"];
         /** The DAG ID that updated the asset. */
         source_dag_id?: components["parameters"]["FilterSourceDAGID"];
@@ -5134,7 +5243,11 @@ export interface operations {
       404: components["responses"]["NotFound"];
     };
   };
-  /** Create asset event */
+  /**
+   * Create asset event
+   *
+   * *Changed in 3.0.0*: The endpoint value was renamed from "/datasets/events"
+   */
   create_asset_event: {
     responses: {
       /** Success. */
diff --git a/airflow/www/static/js/types/index.ts b/airflow/www/static/js/types/index.ts
index 5ae6868647994..4c916269840e5 100644
--- a/airflow/www/static/js/types/index.ts
+++ b/airflow/www/static/js/types/index.ts
@@ -54,7 +54,7 @@ interface Dag {
 
 interface DagRun {
   runId: string;
-  runType: "manual" | "backfill" | "scheduled" | "dataset_triggered";
+  runType: "manual" | "backfill" | "scheduled" | "asset_triggered";
   state: RunState;
   executionDate: string;
   dataIntervalStart: string;
diff --git a/airflow/www/templates/airflow/dataset_next_run_modal.html b/airflow/www/templates/airflow/asset_next_run_modal.html
similarity index 97%
rename from airflow/www/templates/airflow/dataset_next_run_modal.html
rename to airflow/www/templates/airflow/asset_next_run_modal.html
index 6371cd17b2030..676d3dd81b92b 100644
--- a/airflow/www/templates/airflow/dataset_next_run_modal.html
+++ b/airflow/www/templates/airflow/asset_next_run_modal.html
@@ -31,7 +31,7 @@ <h4 class="modal-title" id="datasetNextRunModalLabel">
         </div>
         <div class="modal-body">
           <strong>Conditions</strong>
-          <p><pre id="dataset_expression"></pre></p>
+          <p><pre id="asset_expression"></pre></p>
           <p id="next_run_summary"></p>
           {{ loading_dots(id='datasets-loading-dots', classes='refresh-loading') }}
           <div id="datasets_error" style="display: none; margin-top: 10px;" class="alert alert-danger" role="alert">
diff --git a/airflow/www/templates/airflow/datasets.html b/airflow/www/templates/airflow/assets.html
similarity index 100%
rename from airflow/www/templates/airflow/datasets.html
rename to airflow/www/templates/airflow/assets.html
diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html
index 01b20b2ac7719..329635d6b8217 100644
--- a/airflow/www/templates/airflow/dag.html
+++ b/airflow/www/templates/airflow/dag.html
@@ -17,8 +17,27 @@
  under the License.
 #}
 
+{#
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+#}
+
 {% extends base_template %}
-{% from 'airflow/dataset_next_run_modal.html' import dataset_next_run_modal %}
+{% from 'airflow/asset_next_run_modal.html' import dataset_next_run_modal %}
 {% from 'appbuilder/dag_docs.html' import dag_docs %}
 
 {% block page_title %}{{ dag.dag_display_name }} - {{ appbuilder.app_name }}{% endblock %}
@@ -58,10 +77,10 @@
   <meta name="grid_data_url" content="{{ url_for('Airflow.grid_data') }}">
   <meta name="graph_data_url" content="{{ url_for('Airflow.graph_data') }}">
   <meta name="calendar_data_url" content="{{ url_for('Airflow.calendar_data') }}">
-  <meta name="next_run_datasets_url" content="{{ url_for('Airflow.next_run_datasets', dag_id=dag.dag_id) }}">
+  <meta name="next_run_datasets_url" content="{{ url_for('Airflow.next_run_assets', dag_id=dag.dag_id) }}">
   <meta name="grid_url" content="{{ url_for('Airflow.grid', dag_id=dag.dag_id) }}">
   <meta name="task_tries_api" content="{{ url_for('/api/v1.airflow_api_connexion_endpoints_task_instance_endpoint_get_task_instance_tries', dag_id='_DAG_ID_', dag_run_id='_DAG_RUN_ID_', task_id='_TASK_ID_') }}">
-  <meta name="datasets_url" content="{{ url_for('Airflow.datasets') }}">
+  <meta name="datasets_url" content="{{ url_for('Airflow.assets') }}">
   <meta name="grid_url_no_root" content="{{ url_for('Airflow.grid', dag_id=dag.dag_id, num_runs=num_runs_arg, base_date=base_date_arg) }}">
   <meta name="graph_url" content="{{ url_for('Airflow.graph', dag_id=dag.dag_id, root=root) }}">
   <meta name="task_url" content="{{ url_for('Airflow.task', dag_id=dag.dag_id) }}">
@@ -143,12 +162,12 @@ <h4 class="js-dataset-triggered" style="user-select: none;-moz-user-select: auto
         {% if dag_model is defined and dag_model and dag_model.timetable_description %}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true" data-original-title="Schedule: {{ dag_model.timetable_description|string }}">info</span>
         {% endif %}
-        {% if dag_model is defined and dag_model.next_dagrun is defined and dag_model.dataset_expression != None %}
+        {% if dag_model is defined and dag_model.next_dagrun is defined and dag_model.asset_expression != None %}
           <p class="label label-default js-tooltip" style="margin-left: 5px" id="next-run" data-html="true" data-placement="bottom">
             Next Run ID: <time datetime="{{ dag_model.next_dagrun }}" data-with-tz="true">{{ dag_model.next_dagrun }}</time>
           </p>
         {% endif %}
-        {% if dag_model is defined and dag_model.dataset_expression is defined and dag_model.dataset_expression != None %}
+        {% if dag_model is defined and dag_model.asset_expression is defined and dag_model.asset_expression != None %}
           {%- with asset_info = dag_model.get_asset_triggered_next_run_info() -%}
             <span
               id="next-dataset-tooltip"
diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 6da7090a14781..7ae0523d04048 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -19,7 +19,7 @@
 
 {% extends base_template %}
 {% from 'appbuilder/loading_dots.html' import loading_dots %}
-{% from 'airflow/dataset_next_run_modal.html' import dataset_next_run_modal %}
+{% from 'airflow/asset_next_run_modal.html' import dataset_next_run_modal %}
 {% from 'airflow/_messages.html' import show_message %}
 
 {%- macro sortable_column(dag_display_name, attribute_name) -%}
@@ -69,9 +69,9 @@
   <meta name="dag_stats_url" content="{{ url_for('Airflow.dag_stats') }}">
   <meta name="task_stats_url" content="{{ url_for('Airflow.task_stats') }}">
   <meta name="grid_url" content="{{ url_for('Airflow.grid', dag_id='__DAG_ID__') }}">
-  <meta name="datasets_url" content="{{ url_for('Airflow.datasets') }}">
-  <meta name="next_run_datasets_summary_url" content="{{ url_for('Airflow.next_run_datasets_summary') }}">
-  <meta name="next_run_datasets_url" content="{{ url_for('Airflow.next_run_datasets', dag_id='__DAG_ID__') }}">
+  <meta name="datasets_url" content="{{ url_for('Airflow.assets') }}">
+  <meta name="next_run_datasets_summary_url" content="{{ url_for('Airflow.next_run_assets_summary') }}">
+  <meta name="next_run_datasets_url" content="{{ url_for('Airflow.next_run_assets', dag_id='__DAG_ID__') }}">
 {% endblock %}
 
 {% block head_css %}
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 1751bb33de3a4..c5bbdd389b093 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -468,7 +468,7 @@ def set_overall_state(record):
                 "label": item.label,
                 "extra_links": item.extra_links,
                 "is_mapped": item_is_mapped,
-                "has_outlet_datasets": any(isinstance(i, (Asset, AssetAlias)) for i in (item.outlets or [])),
+                "has_outlet_assets": any(isinstance(i, (Asset, AssetAlias)) for i in (item.outlets or [])),
                 "operator": item.operator_name,
                 "trigger_rule": item.trigger_rule,
                 **setup_teardown_type,
@@ -1005,7 +1005,7 @@ def index(self):
                 .all()
             )
 
-            asset_triggered_dag_ids = {dag.dag_id for dag in dags if dag.dataset_expression is not None}
+            asset_triggered_dag_ids = {dag.dag_id for dag in dags if dag.asset_expression is not None}
             if asset_triggered_dag_ids:
                 asset_triggered_next_run_info = get_asset_triggered_next_run_info(
                     asset_triggered_dag_ids, session=session
@@ -1173,14 +1173,14 @@ def _iter_parsed_moved_data_table_names():
             file_tokens=file_tokens,
         )
 
-    @expose("/datasets")
+    @expose("/assets")
     @auth.has_access_asset("GET")
-    def datasets(self):
+    def assets(self):
         """Assets view."""
         state_color_mapping = State.state_color.copy()
         state_color_mapping["null"] = state_color_mapping.pop(None)
         return self.render_template(
-            "airflow/datasets.html",
+            "airflow/assets.html",
             auto_refresh_interval=conf.getint("webserver", "auto_refresh_interval"),
             state_color_mapping=state_color_mapping,
         )
@@ -1199,10 +1199,10 @@ def cluster_activity(self):
             standalone_dag_processor=standalone_dag_processor,
         )
 
-    @expose("/next_run_datasets_summary", methods=["POST"])
+    @expose("/next_run_assets_summary", methods=["POST"])
     @provide_session
-    def next_run_datasets_summary(self, session: Session = NEW_SESSION):
-        """Next run info for dataset triggered DAGs."""
+    def next_run_assets_summary(self, session: Session = NEW_SESSION):
+        """Next run info for asset triggered DAGs."""
         allowed_dag_ids = get_auth_manager().get_permitted_dag_ids(user=g.user)
 
         if not allowed_dag_ids:
@@ -1216,14 +1216,14 @@ def next_run_datasets_summary(self, session: Session = NEW_SESSION):
         else:
             filter_dag_ids = allowed_dag_ids
 
-        dataset_triggered_dag_ids = session.scalars(
+        asset_triggered_dag_ids = session.scalars(
             select(DagModel.dag_id)
             .where(DagModel.dag_id.in_(filter_dag_ids))
-            .where(DagModel.dataset_expression.is_not(None))
+            .where(DagModel.asset_expression.is_not(None))
         ).all()
 
         asset_triggered_next_run_info = get_asset_triggered_next_run_info(
-            dataset_triggered_dag_ids, session=session
+            asset_triggered_dag_ids, session=session
         )
 
         return flask.json.jsonify(asset_triggered_next_run_info)
@@ -3406,12 +3406,12 @@ def historical_metrics_data(self):
             {"Content-Type": "application/json; charset=utf-8"},
         )
 
-    @expose("/object/next_run_datasets/<string:dag_id>")
+    @expose("/object/next_run_assets/<string:dag_id>")
     @auth.has_access_dag("GET", DagAccessEntity.RUN)
     @auth.has_access_asset("GET")
     @mark_fastapi_migration_done
-    def next_run_datasets(self, dag_id):
-        """Return datasets necessary, and their status, for the next dag run."""
+    def next_run_assets(self, dag_id):
+        """Return assets necessary, and their status, for the next dag run."""
         dag = get_airflow_app().dag_bag.get_dag(dag_id)
         if not dag:
             return {"error": f"can't find dag {dag_id}"}, 404
@@ -3429,11 +3429,11 @@ def next_run_datasets(self, dag_id):
                         AssetModel.uri,
                         func.max(AssetEvent.timestamp).label("lastUpdate"),
                     )
-                    .join(DagScheduleAssetReference, DagScheduleAssetReference.dataset_id == AssetModel.id)
+                    .join(DagScheduleAssetReference, DagScheduleAssetReference.asset_id == AssetModel.id)
                     .join(
                         AssetDagRunQueue,
                         and_(
-                            AssetDagRunQueue.dataset_id == AssetModel.id,
+                            AssetDagRunQueue.asset_id == AssetModel.id,
                             AssetDagRunQueue.target_dag_id == DagScheduleAssetReference.dag_id,
                         ),
                         isouter=True,
@@ -3441,7 +3441,7 @@ def next_run_datasets(self, dag_id):
                     .join(
                         AssetEvent,
                         and_(
-                            AssetEvent.dataset_id == AssetModel.id,
+                            AssetEvent.asset_id == AssetModel.id,
                             (
                                 AssetEvent.timestamp >= latest_run.execution_date
                                 if latest_run and latest_run.execution_date
@@ -3455,16 +3455,16 @@ def next_run_datasets(self, dag_id):
                     .order_by(AssetModel.uri)
                 )
             ]
-            data = {"dataset_expression": dag_model.dataset_expression, "events": events}
+            data = {"asset_expression": dag_model.asset_expression, "events": events}
         return (
             htmlsafe_json_dumps(data, separators=(",", ":"), dumps=flask.json.dumps),
             {"Content-Type": "application/json; charset=utf-8"},
         )
 
-    @expose("/object/dataset_dependencies")
+    @expose("/object/asset_dependencies")
     @auth.has_access_dag("GET", DagAccessEntity.DEPENDENCIES)
-    def dataset_dependencies(self):
-        """Return dataset dependencies graph."""
+    def asset_dependencies(self):
+        """Return asset dependencies graph."""
         nodes_dict: dict[str, Any] = {}
         edge_tuples: set[dict[str, str]] = set()
 
@@ -3507,15 +3507,15 @@ def dataset_dependencies(self):
             {"Content-Type": "application/json; charset=utf-8"},
         )
 
-    @expose("/object/datasets_summary")
+    @expose("/object/assets_summary")
     @auth.has_access_asset("GET")
-    def datasets_summary(self):
+    def assets_summary(self):
         """
-        Get a summary of datasets.
+        Get a summary of assets.
 
         Includes the datetime they were last updated and how many updates they've ever had.
         """
-        allowed_attrs = ["uri", "last_dataset_update"]
+        allowed_attrs = ["uri", "last_asset_update"]
 
         # Grab query parameters
         limit = int(request.args.get("limit", 25))
@@ -3545,7 +3545,7 @@ def datasets_summary(self):
                     order_by = (AssetModel.uri.desc(),)
                 else:
                     order_by = (AssetModel.uri.asc(),)
-            elif lstripped_orderby == "last_dataset_update":
+            elif lstripped_orderby == "last_asset_update":
                 if order_by.startswith("-"):
                     order_by = (
                         func.max(AssetEvent.timestamp).desc(),
@@ -3569,10 +3569,10 @@ def datasets_summary(self):
                 select(
                     AssetModel.id,
                     AssetModel.uri,
-                    func.max(AssetEvent.timestamp).label("last_dataset_update"),
+                    func.max(AssetEvent.timestamp).label("last_asset_update"),
                     func.sum(case((AssetEvent.id.is_not(None), 1), else_=0)).label("total_updates"),
                 )
-                .join(AssetEvent, AssetEvent.dataset_id == AssetModel.id, isouter=not has_event_filters)
+                .join(AssetEvent, AssetEvent.asset_id == AssetModel.id, isouter=not has_event_filters)
                 .group_by(
                     AssetModel.id,
                     AssetModel.uri,
@@ -3581,7 +3581,7 @@ def datasets_summary(self):
             )
 
             if has_event_filters:
-                count_query = count_query.join(AssetEvent, AssetEvent.dataset_id == AssetModel.id)
+                count_query = count_query.join(AssetEvent, AssetEvent.asset_id == AssetModel.id)
 
             filters = [AssetModel.active.has()]
             if uri_pattern:
@@ -3595,8 +3595,8 @@ def datasets_summary(self):
             count_query = count_query.where(*filters)
 
             query = session.execute(query)
-            datasets = [dict(dataset._mapping) for dataset in query]
-            data = {"datasets": datasets, "total_entries": session.scalar(count_query)}
+            assets = [dict(asset._mapping) for asset in query]
+            data = {"assets": assets, "total_entries": session.scalar(count_query)}
 
             return (
                 htmlsafe_json_dumps(data, separators=(",", ":"), cls=utils_json.WebEncoder),
diff --git a/docs/apache-airflow/img/airflow_erd.sha256 b/docs/apache-airflow/img/airflow_erd.sha256
index 6d096f7324eb5..9386cf49a0442 100644
--- a/docs/apache-airflow/img/airflow_erd.sha256
+++ b/docs/apache-airflow/img/airflow_erd.sha256
@@ -1 +1 @@
-15cd7929c7e5bd787115396bf4e3ba6e6a228824ee8fc7f8406d19da82051d01
\ No newline at end of file
+a874f49d63f37d46c47de8e473aa87b8877b0c5a9f670722017cfd0ea9aeec51
\ No newline at end of file
diff --git a/docs/apache-airflow/img/airflow_erd.svg b/docs/apache-airflow/img/airflow_erd.svg
index f9165e9ee4c4c..7aed6e2912734 100644
--- a/docs/apache-airflow/img/airflow_erd.svg
+++ b/docs/apache-airflow/img/airflow_erd.svg
@@ -4,11 +4,11 @@
 <!-- Generated by graphviz version 2.43.0 (0)
  -->
 <!-- Title: %3 Pages: 1 -->
-<svg width="1651pt" height="4955pt"
- viewBox="0.00 0.00 1651.00 4955.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 4951)">
+<svg width="1632pt" height="5434pt"
+ viewBox="0.00 0.00 1632.00 5434.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 5430)">
 <title>%3</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-4951 1647,-4951 1647,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-5430 1628,-5430 1628,4 -4,4"/>
 <!-- log -->
 <g id="node1" class="node">
 <title>log</title>
@@ -393,2009 +393,1981 @@
 <text text-anchor="start" x="142.5" y="-2180.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
 <text text-anchor="start" x="147.5" y="-2180.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
 </g>
-<!-- dataset_alias -->
+<!-- asset_alias -->
 <g id="node12" class="node">
-<title>dataset_alias</title>
-<polygon fill="none" stroke="black" points="465,-4005 465,-4033 727,-4033 727,-4005 465,-4005"/>
-<text text-anchor="start" x="537" y="-4016.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset_alias</text>
-<polygon fill="none" stroke="black" points="465,-3980 465,-4005 727,-4005 727,-3980 465,-3980"/>
-<text text-anchor="start" x="470" y="-3989.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="483" y="-3989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="488" y="-3989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="565" y="-3989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="465,-3955 465,-3980 727,-3980 727,-3955 465,-3955"/>
-<text text-anchor="start" x="470" y="-3964.8" font-family="Helvetica,sans-Serif" font-size="14.00">group</text>
-<text text-anchor="start" x="511" y="-3964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="516" y="-3964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="646" y="-3964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="465,-3930 465,-3955 727,-3955 727,-3930 465,-3930"/>
-<text text-anchor="start" x="470" y="-3939.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
-<text text-anchor="start" x="510" y="-3939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="515" y="-3939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="645" y="-3939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_alias_dataset -->
+<title>asset_alias</title>
+<polygon fill="none" stroke="black" points="465,-4460 465,-4488 727,-4488 727,-4460 465,-4460"/>
+<text text-anchor="start" x="547" y="-4471.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_alias</text>
+<polygon fill="none" stroke="black" points="465,-4435 465,-4460 727,-4460 727,-4435 465,-4435"/>
+<text text-anchor="start" x="470" y="-4444.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="483" y="-4444.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="488" y="-4444.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="565" y="-4444.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="465,-4410 465,-4435 727,-4435 727,-4410 465,-4410"/>
+<text text-anchor="start" x="470" y="-4419.8" font-family="Helvetica,sans-Serif" font-size="14.00">group</text>
+<text text-anchor="start" x="511" y="-4419.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="516" y="-4419.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="646" y="-4419.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="465,-4385 465,-4410 727,-4410 727,-4385 465,-4385"/>
+<text text-anchor="start" x="470" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
+<text text-anchor="start" x="510" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="515" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="645" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_alias_asset -->
 <g id="node13" class="node">
-<title>dataset_alias_dataset</title>
-<polygon fill="none" stroke="black" points="942.5,-4177 942.5,-4205 1182.5,-4205 1182.5,-4177 942.5,-4177"/>
-<text text-anchor="start" x="966" y="-4188.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset_alias_dataset</text>
-<polygon fill="none" stroke="black" points="942.5,-4152 942.5,-4177 1182.5,-4177 1182.5,-4152 942.5,-4152"/>
-<text text-anchor="start" x="947.5" y="-4161.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
-<text text-anchor="start" x="999.5" y="-4161.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1004.5" y="-4161.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1081.5" y="-4161.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="942.5,-4127 942.5,-4152 1182.5,-4152 1182.5,-4127 942.5,-4127"/>
-<text text-anchor="start" x="947.5" y="-4136.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dataset_id</text>
-<text text-anchor="start" x="1019.5" y="-4136.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1024.5" y="-4136.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1101.5" y="-4136.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_alias&#45;&#45;dataset_alias_dataset -->
+<title>asset_alias_asset</title>
+<polygon fill="none" stroke="black" points="941,-4815 941,-4843 1166,-4843 1166,-4815 941,-4815"/>
+<text text-anchor="start" x="976.5" y="-4826.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_alias_asset</text>
+<polygon fill="none" stroke="black" points="941,-4790 941,-4815 1166,-4815 1166,-4790 941,-4790"/>
+<text text-anchor="start" x="946" y="-4799.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
+<text text-anchor="start" x="998" y="-4799.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1003" y="-4799.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1080" y="-4799.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="941,-4765 941,-4790 1166,-4790 1166,-4765 941,-4765"/>
+<text text-anchor="start" x="946" y="-4774.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">asset_id</text>
+<text text-anchor="start" x="1003" y="-4774.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1008" y="-4774.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1085" y="-4774.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_alias&#45;&#45;asset_alias_asset -->
 <g id="edge1" class="edge">
-<title>dataset_alias&#45;&#45;dataset_alias_dataset</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.15,-4010.36C759.46,-4019.09 784.01,-4029.66 806,-4042 843.12,-4062.84 841.51,-4083.84 879,-4104 896.14,-4113.22 915.08,-4121 934.07,-4127.64"/>
-<text text-anchor="start" x="903.07" y="-4116.44" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.15" y="-3999.16" font-family="Times,serif" font-size="14.00">1</text>
+<title>asset_alias&#45;&#45;asset_alias_asset</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.21,-4475.26C761.42,-4487.66 786.65,-4503.88 806,-4525 877.59,-4603.14 803.35,-4677.78 879,-4752 893.89,-4766.61 912.71,-4777.13 932.43,-4784.71"/>
+<text text-anchor="start" x="901.43" y="-4773.51" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="735.21" y="-4464.06" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dataset_alias&#45;&#45;dataset_alias_dataset -->
-<g id="edge2" class="edge">
-<title>dataset_alias&#45;&#45;dataset_alias_dataset</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.15,-4028.05C759.46,-4037.09 784.01,-4047.66 806,-4060 843.12,-4080.84 841.51,-4101.84 879,-4122 896.14,-4131.22 915.08,-4139 934.07,-4145.42"/>
-<text text-anchor="start" x="903.07" y="-4134.22" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.15" y="-4016.85" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- dataset_alias_dataset_event -->
+<!-- asset_alias_asset_event -->
 <g id="node14" class="node">
-<title>dataset_alias_dataset_event</title>
-<polygon fill="none" stroke="black" points="931.5,-3067 931.5,-3095 1193.5,-3095 1193.5,-3067 931.5,-3067"/>
-<text text-anchor="start" x="936.5" y="-3078.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset_alias_dataset_event</text>
-<polygon fill="none" stroke="black" points="931.5,-3042 931.5,-3067 1193.5,-3067 1193.5,-3042 931.5,-3042"/>
-<text text-anchor="start" x="936.5" y="-3051.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
-<text text-anchor="start" x="988.5" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="993.5" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1070.5" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="931.5,-3017 931.5,-3042 1193.5,-3042 1193.5,-3017 931.5,-3017"/>
-<text text-anchor="start" x="936.5" y="-3026.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">event_id</text>
-<text text-anchor="start" x="995.5" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1000.5" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1077.5" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_alias&#45;&#45;dataset_alias_dataset_event -->
-<g id="edge3" class="edge">
-<title>dataset_alias&#45;&#45;dataset_alias_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.26,-3955.83C762.36,-3945.94 787.95,-3931.25 806,-3909 862.94,-3838.84 821.37,-3168.6 879,-3099 890.87,-3084.66 906.39,-3074.12 923.37,-3066.49"/>
-<text text-anchor="start" x="892.37" y="-3070.29" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.26" y="-3944.63" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- dataset_alias&#45;&#45;dataset_alias_dataset_event -->
-<g id="edge4" class="edge">
-<title>dataset_alias&#45;&#45;dataset_alias_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.26,-3973.36C762.36,-3963.94 787.95,-3949.25 806,-3927 862.94,-3856.84 821.37,-3186.6 879,-3117 890.87,-3102.66 906.39,-3092.12 923.37,-3084.3"/>
-<text text-anchor="start" x="892.37" y="-3088.1" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.26" y="-3962.16" font-family="Times,serif" font-size="14.00">1</text>
+<title>asset_alias_asset_event</title>
+<polygon fill="none" stroke="black" points="940,-3602 940,-3630 1167,-3630 1167,-3602 940,-3602"/>
+<text text-anchor="start" x="947" y="-3613.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_alias_asset_event</text>
+<polygon fill="none" stroke="black" points="940,-3577 940,-3602 1167,-3602 1167,-3577 940,-3577"/>
+<text text-anchor="start" x="945" y="-3586.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
+<text text-anchor="start" x="997" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1002" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1079" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="940,-3552 940,-3577 1167,-3577 1167,-3552 940,-3552"/>
+<text text-anchor="start" x="945" y="-3561.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">event_id</text>
+<text text-anchor="start" x="1004" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1009" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1086" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_alias&#45;&#45;asset_alias_asset_event -->
+<g id="edge2" class="edge">
+<title>asset_alias&#45;&#45;asset_alias_asset_event</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.1,-4419.46C762.21,-4409.81 787.84,-4395.16 806,-4373 857.68,-4309.96 827.16,-3705.91 879,-3643 892.56,-3626.54 911.13,-3615.16 931.08,-3607.31"/>
+<text text-anchor="start" x="900.08" y="-3596.11" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="735.1" y="-4408.26" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dag_schedule_dataset_alias_reference -->
+<!-- dag_schedule_asset_alias_reference -->
 <g id="node15" class="node">
-<title>dag_schedule_dataset_alias_reference</title>
-<polygon fill="none" stroke="black" points="887.5,-3609 887.5,-3637 1238.5,-3637 1238.5,-3609 887.5,-3609"/>
-<text text-anchor="start" x="892.5" y="-3620.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_schedule_dataset_alias_reference</text>
-<polygon fill="none" stroke="black" points="887.5,-3584 887.5,-3609 1238.5,-3609 1238.5,-3584 887.5,-3584"/>
-<text text-anchor="start" x="892.5" y="-3593.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
-<text text-anchor="start" x="944.5" y="-3593.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="949.5" y="-3593.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1026.5" y="-3593.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="887.5,-3559 887.5,-3584 1238.5,-3584 1238.5,-3559 887.5,-3559"/>
-<text text-anchor="start" x="892.5" y="-3568.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="938.5" y="-3568.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="943.5" y="-3568.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1064.5" y="-3568.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="887.5,-3534 887.5,-3559 1238.5,-3559 1238.5,-3534 887.5,-3534"/>
-<text text-anchor="start" x="892.5" y="-3543.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="965.5" y="-3543.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="970.5" y="-3543.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1066.5" y="-3543.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="887.5,-3509 887.5,-3534 1238.5,-3534 1238.5,-3509 887.5,-3509"/>
-<text text-anchor="start" x="892.5" y="-3518.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="971.5" y="-3518.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="976.5" y="-3518.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1072.5" y="-3518.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_alias&#45;&#45;dag_schedule_dataset_alias_reference -->
-<g id="edge5" class="edge">
-<title>dataset_alias&#45;&#45;dag_schedule_dataset_alias_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.15,-3961.14C761.44,-3951.64 786.72,-3937.89 806,-3918 827.48,-3895.84 858.68,-3673.23 879,-3650 881.72,-3646.89 884.58,-3643.91 887.57,-3641.04"/>
-<text text-anchor="start" x="856.57" y="-3644.84" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.15" y="-3949.94" font-family="Times,serif" font-size="14.00">1</text>
+<title>dag_schedule_asset_alias_reference</title>
+<polygon fill="none" stroke="black" points="887,-4453 887,-4481 1219,-4481 1219,-4453 887,-4453"/>
+<text text-anchor="start" x="892" y="-4464.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_schedule_asset_alias_reference</text>
+<polygon fill="none" stroke="black" points="887,-4428 887,-4453 1219,-4453 1219,-4428 887,-4428"/>
+<text text-anchor="start" x="892" y="-4437.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">alias_id</text>
+<text text-anchor="start" x="944" y="-4437.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="949" y="-4437.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1026" y="-4437.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="887,-4403 887,-4428 1219,-4428 1219,-4403 887,-4403"/>
+<text text-anchor="start" x="892" y="-4412.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="938" y="-4412.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="943" y="-4412.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1064" y="-4412.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="887,-4378 887,-4403 1219,-4403 1219,-4378 887,-4378"/>
+<text text-anchor="start" x="892" y="-4387.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="965" y="-4387.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="970" y="-4387.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1066" y="-4387.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="887,-4353 887,-4378 1219,-4378 1219,-4353 887,-4353"/>
+<text text-anchor="start" x="892" y="-4362.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="971" y="-4362.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="976" y="-4362.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1072" y="-4362.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_alias&#45;&#45;dag_schedule_asset_alias_reference -->
+<g id="edge3" class="edge">
+<title>asset_alias&#45;&#45;dag_schedule_asset_alias_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.06,-4430.93C780.3,-4428.94 831.15,-4426.71 878.66,-4424.62"/>
+<text text-anchor="start" x="847.66" y="-4413.42" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="735.06" y="-4434.73" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dataset -->
+<!-- asset -->
 <g id="node16" class="node">
-<title>dataset</title>
-<polygon fill="none" stroke="black" points="463,-4239 463,-4267 729,-4267 729,-4239 463,-4239"/>
-<text text-anchor="start" x="562" y="-4250.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset</text>
-<polygon fill="none" stroke="black" points="463,-4214 463,-4239 729,-4239 729,-4214 463,-4214"/>
-<text text-anchor="start" x="468" y="-4223.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="481" y="-4223.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="486" y="-4223.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="563" y="-4223.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4189 463,-4214 729,-4214 729,-4189 463,-4189"/>
-<text text-anchor="start" x="468" y="-4198.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="541" y="-4198.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="546" y="-4198.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="642" y="-4198.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4164 463,-4189 729,-4189 729,-4164 463,-4164"/>
-<text text-anchor="start" x="468" y="-4173.8" font-family="Helvetica,sans-Serif" font-size="14.00">extra</text>
-<text text-anchor="start" x="505" y="-4173.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="510" y="-4173.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<text text-anchor="start" x="561" y="-4173.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4139 463,-4164 729,-4164 729,-4139 463,-4139"/>
-<text text-anchor="start" x="468" y="-4148.8" font-family="Helvetica,sans-Serif" font-size="14.00">group</text>
-<text text-anchor="start" x="509" y="-4148.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="514" y="-4148.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="644" y="-4148.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4114 463,-4139 729,-4139 729,-4114 463,-4114"/>
-<text text-anchor="start" x="468" y="-4123.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
-<text text-anchor="start" x="508" y="-4123.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="513" y="-4123.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="643" y="-4123.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4089 463,-4114 729,-4114 729,-4089 463,-4089"/>
-<text text-anchor="start" x="468" y="-4098.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="547" y="-4098.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="552" y="-4098.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="648" y="-4098.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="463,-4064 463,-4089 729,-4089 729,-4064 463,-4064"/>
-<text text-anchor="start" x="468" y="-4073.8" font-family="Helvetica,sans-Serif" font-size="14.00">uri</text>
-<text text-anchor="start" x="487" y="-4073.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="492" y="-4073.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="622" y="-4073.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset&#45;&#45;dataset_alias_dataset -->
-<g id="edge6" class="edge">
-<title>dataset&#45;&#45;dataset_alias_dataset</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.31,-4159.74C799.94,-4159.04 873.2,-4159.09 934.23,-4159.9"/>
-<text text-anchor="start" x="903.23" y="-4163.7" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="737.31" y="-4148.54" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- dataset&#45;&#45;dataset_alias_dataset -->
-<g id="edge7" class="edge">
-<title>dataset&#45;&#45;dataset_alias_dataset</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.31,-4172.26C799.94,-4172.96 873.2,-4172.91 934.23,-4172.1"/>
-<text text-anchor="start" x="903.23" y="-4175.9" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="737.31" y="-4176.06" font-family="Times,serif" font-size="14.00">1</text>
+<title>asset</title>
+<polygon fill="none" stroke="black" points="463,-4713 463,-4741 729,-4741 729,-4713 463,-4713"/>
+<text text-anchor="start" x="571.5" y="-4724.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset</text>
+<polygon fill="none" stroke="black" points="463,-4688 463,-4713 729,-4713 729,-4688 463,-4688"/>
+<text text-anchor="start" x="468" y="-4697.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="481" y="-4697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="486" y="-4697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="563" y="-4697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4663 463,-4688 729,-4688 729,-4663 463,-4663"/>
+<text text-anchor="start" x="468" y="-4672.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="541" y="-4672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="546" y="-4672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="642" y="-4672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4638 463,-4663 729,-4663 729,-4638 463,-4638"/>
+<text text-anchor="start" x="468" y="-4647.8" font-family="Helvetica,sans-Serif" font-size="14.00">extra</text>
+<text text-anchor="start" x="505" y="-4647.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="510" y="-4647.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<text text-anchor="start" x="561" y="-4647.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4613 463,-4638 729,-4638 729,-4613 463,-4613"/>
+<text text-anchor="start" x="468" y="-4622.8" font-family="Helvetica,sans-Serif" font-size="14.00">group</text>
+<text text-anchor="start" x="509" y="-4622.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="514" y="-4622.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="644" y="-4622.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4588 463,-4613 729,-4613 729,-4588 463,-4588"/>
+<text text-anchor="start" x="468" y="-4597.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
+<text text-anchor="start" x="508" y="-4597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="513" y="-4597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="643" y="-4597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4563 463,-4588 729,-4588 729,-4563 463,-4563"/>
+<text text-anchor="start" x="468" y="-4572.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="547" y="-4572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="552" y="-4572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="648" y="-4572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="463,-4538 463,-4563 729,-4563 729,-4538 463,-4538"/>
+<text text-anchor="start" x="468" y="-4547.8" font-family="Helvetica,sans-Serif" font-size="14.00">uri</text>
+<text text-anchor="start" x="487" y="-4547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="492" y="-4547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="622" y="-4547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset&#45;&#45;asset_alias_asset -->
+<g id="edge4" class="edge">
+<title>asset&#45;&#45;asset_alias_asset</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.32,-4718.62C770.87,-4735.11 807.09,-4751.08 842,-4763 870.65,-4772.78 902.34,-4780.49 932.24,-4786.46"/>
+<text text-anchor="start" x="901.24" y="-4790.26" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="737.32" y="-4707.42" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- asset_active -->
 <g id="node17" class="node">
 <title>asset_active</title>
-<polygon fill="none" stroke="black" points="932.5,-4281 932.5,-4309 1193.5,-4309 1193.5,-4281 932.5,-4281"/>
-<text text-anchor="start" x="1007.5" y="-4292.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_active</text>
-<polygon fill="none" stroke="black" points="932.5,-4256 932.5,-4281 1193.5,-4281 1193.5,-4256 932.5,-4256"/>
-<text text-anchor="start" x="937.5" y="-4265.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">name</text>
-<text text-anchor="start" x="977.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="982.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="1112.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="932.5,-4231 932.5,-4256 1193.5,-4256 1193.5,-4231 932.5,-4231"/>
-<text text-anchor="start" x="937.5" y="-4240.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">uri</text>
-<text text-anchor="start" x="956.5" y="-4240.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="961.5" y="-4240.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
-<text text-anchor="start" x="1091.5" y="-4240.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset&#45;&#45;asset_active -->
-<g id="edge8" class="edge">
-<title>dataset&#45;&#45;asset_active</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.31,-4191.16C796.47,-4203.73 865.11,-4219.12 923.97,-4232.98"/>
-<text text-anchor="start" x="913.97" y="-4221.78" font-family="Times,serif" font-size="14.00">1</text>
-<text text-anchor="start" x="737.31" y="-4194.96" font-family="Times,serif" font-size="14.00">1</text>
+<polygon fill="none" stroke="black" points="923,-4711 923,-4739 1184,-4739 1184,-4711 923,-4711"/>
+<text text-anchor="start" x="998" y="-4722.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_active</text>
+<polygon fill="none" stroke="black" points="923,-4686 923,-4711 1184,-4711 1184,-4686 923,-4686"/>
+<text text-anchor="start" x="928" y="-4695.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">name</text>
+<text text-anchor="start" x="968" y="-4695.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="973" y="-4695.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="1103" y="-4695.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="923,-4661 923,-4686 1184,-4686 1184,-4661 923,-4661"/>
+<text text-anchor="start" x="928" y="-4670.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">uri</text>
+<text text-anchor="start" x="947" y="-4670.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="952" y="-4670.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1500)]</text>
+<text text-anchor="start" x="1082" y="-4670.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset&#45;&#45;asset_active -->
+<g id="edge5" class="edge">
+<title>asset&#45;&#45;asset_active</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.23,-4652.2C793.5,-4659 858.16,-4667.54 914.19,-4675.57"/>
+<text text-anchor="start" x="904.19" y="-4664.37" font-family="Times,serif" font-size="14.00">1</text>
+<text text-anchor="start" x="737.23" y="-4641" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dataset&#45;&#45;asset_active -->
-<g id="edge9" class="edge">
-<title>dataset&#45;&#45;asset_active</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.31,-4203.67C796.47,-4217.59 865.11,-4232.94 923.97,-4245.43"/>
-<text text-anchor="start" x="913.97" y="-4249.23" font-family="Times,serif" font-size="14.00">1</text>
-<text text-anchor="start" x="737.31" y="-4207.47" font-family="Times,serif" font-size="14.00">1</text>
+<!-- asset&#45;&#45;asset_active -->
+<g id="edge6" class="edge">
+<title>asset&#45;&#45;asset_active</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.23,-4664.78C793.5,-4672.82 858.16,-4681.34 914.19,-4688.09"/>
+<text text-anchor="start" x="904.19" y="-4691.89" font-family="Times,serif" font-size="14.00">1</text>
+<text text-anchor="start" x="737.23" y="-4668.58" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dag_schedule_dataset_reference -->
+<!-- dag_schedule_asset_reference -->
 <g id="node18" class="node">
-<title>dag_schedule_dataset_reference</title>
-<polygon fill="none" stroke="black" points="911.5,-3893 911.5,-3921 1213.5,-3921 1213.5,-3893 911.5,-3893"/>
-<text text-anchor="start" x="916.5" y="-3904.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_schedule_dataset_reference</text>
-<polygon fill="none" stroke="black" points="911.5,-3868 911.5,-3893 1213.5,-3893 1213.5,-3868 911.5,-3868"/>
-<text text-anchor="start" x="916.5" y="-3877.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="962.5" y="-3877.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="967.5" y="-3877.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1088.5" y="-3877.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="911.5,-3843 911.5,-3868 1213.5,-3868 1213.5,-3843 911.5,-3843"/>
-<text text-anchor="start" x="916.5" y="-3852.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dataset_id</text>
-<text text-anchor="start" x="988.5" y="-3852.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="993.5" y="-3852.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1070.5" y="-3852.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="911.5,-3818 911.5,-3843 1213.5,-3843 1213.5,-3818 911.5,-3818"/>
-<text text-anchor="start" x="916.5" y="-3827.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="989.5" y="-3827.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="994.5" y="-3827.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1090.5" y="-3827.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="911.5,-3793 911.5,-3818 1213.5,-3818 1213.5,-3793 911.5,-3793"/>
-<text text-anchor="start" x="916.5" y="-3802.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="995.5" y="-3802.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1000.5" y="-3802.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1096.5" y="-3802.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset&#45;&#45;dag_schedule_dataset_reference -->
-<g id="edge10" class="edge">
-<title>dataset&#45;&#45;dag_schedule_dataset_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.23,-4097.84C761.6,-4082.65 785.63,-4065.26 806,-4046 849.18,-4005.19 833.41,-3972.11 879,-3934 886.52,-3927.71 894.63,-3921.87 903.1,-3916.46"/>
-<text text-anchor="start" x="872.1" y="-3905.26" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="737.23" y="-4086.64" font-family="Times,serif" font-size="14.00">1</text>
+<title>dag_schedule_asset_reference</title>
+<polygon fill="none" stroke="black" points="912,-4607 912,-4635 1194,-4635 1194,-4607 912,-4607"/>
+<text text-anchor="start" x="917" y="-4618.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_schedule_asset_reference</text>
+<polygon fill="none" stroke="black" points="912,-4582 912,-4607 1194,-4607 1194,-4582 912,-4582"/>
+<text text-anchor="start" x="917" y="-4591.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">asset_id</text>
+<text text-anchor="start" x="974" y="-4591.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="979" y="-4591.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1056" y="-4591.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="912,-4557 912,-4582 1194,-4582 1194,-4557 912,-4557"/>
+<text text-anchor="start" x="917" y="-4566.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="963" y="-4566.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="968" y="-4566.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1089" y="-4566.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="912,-4532 912,-4557 1194,-4557 1194,-4532 912,-4532"/>
+<text text-anchor="start" x="917" y="-4541.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="990" y="-4541.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="995" y="-4541.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1091" y="-4541.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="912,-4507 912,-4532 1194,-4532 1194,-4507 912,-4507"/>
+<text text-anchor="start" x="917" y="-4516.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="996" y="-4516.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1001" y="-4516.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1097" y="-4516.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset&#45;&#45;dag_schedule_asset_reference -->
+<g id="edge7" class="edge">
+<title>asset&#45;&#45;dag_schedule_asset_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.23,-4618.73C790.1,-4610.72 850.39,-4601.57 903.96,-4593.45"/>
+<text text-anchor="start" x="872.96" y="-4582.25" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="737.23" y="-4607.53" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- task_outlet_dataset_reference -->
+<!-- task_outlet_asset_reference -->
 <g id="node19" class="node">
-<title>task_outlet_dataset_reference</title>
-<polygon fill="none" stroke="black" points="922.5,-4072 922.5,-4100 1203.5,-4100 1203.5,-4072 922.5,-4072"/>
-<text text-anchor="start" x="927.5" y="-4083.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_outlet_dataset_reference</text>
-<polygon fill="none" stroke="black" points="922.5,-4047 922.5,-4072 1203.5,-4072 1203.5,-4047 922.5,-4047"/>
-<text text-anchor="start" x="927.5" y="-4056.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="973.5" y="-4056.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="978.5" y="-4056.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1099.5" y="-4056.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="922.5,-4022 922.5,-4047 1203.5,-4047 1203.5,-4022 922.5,-4022"/>
-<text text-anchor="start" x="927.5" y="-4031.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dataset_id</text>
-<text text-anchor="start" x="999.5" y="-4031.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1004.5" y="-4031.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1081.5" y="-4031.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="922.5,-3997 922.5,-4022 1203.5,-4022 1203.5,-3997 922.5,-3997"/>
-<text text-anchor="start" x="927.5" y="-4006.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="976.5" y="-4006.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="981.5" y="-4006.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1102.5" y="-4006.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="922.5,-3972 922.5,-3997 1203.5,-3997 1203.5,-3972 922.5,-3972"/>
-<text text-anchor="start" x="927.5" y="-3981.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="1000.5" y="-3981.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1005.5" y="-3981.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1101.5" y="-3981.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="922.5,-3947 922.5,-3972 1203.5,-3972 1203.5,-3947 922.5,-3947"/>
-<text text-anchor="start" x="927.5" y="-3956.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="1006.5" y="-3956.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1011.5" y="-3956.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1107.5" y="-3956.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset&#45;&#45;task_outlet_dataset_reference -->
-<g id="edge11" class="edge">
-<title>dataset&#45;&#45;task_outlet_dataset_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.31,-4123.11C793.13,-4106.04 857.4,-4086.4 913.91,-4069.12"/>
-<text text-anchor="start" x="882.91" y="-4057.92" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="737.31" y="-4111.91" font-family="Times,serif" font-size="14.00">1</text>
+<title>task_outlet_asset_reference</title>
+<polygon fill="none" stroke="black" points="920,-4298 920,-4326 1186,-4326 1186,-4298 920,-4298"/>
+<text text-anchor="start" x="927.5" y="-4309.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_outlet_asset_reference</text>
+<polygon fill="none" stroke="black" points="920,-4273 920,-4298 1186,-4298 1186,-4273 920,-4273"/>
+<text text-anchor="start" x="925" y="-4282.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">asset_id</text>
+<text text-anchor="start" x="982" y="-4282.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="987" y="-4282.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1064" y="-4282.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-4248 920,-4273 1186,-4273 1186,-4248 920,-4248"/>
+<text text-anchor="start" x="925" y="-4257.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="971" y="-4257.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="976" y="-4257.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1097" y="-4257.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-4223 920,-4248 1186,-4248 1186,-4223 920,-4223"/>
+<text text-anchor="start" x="925" y="-4232.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="974" y="-4232.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="979" y="-4232.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1100" y="-4232.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-4198 920,-4223 1186,-4223 1186,-4198 920,-4198"/>
+<text text-anchor="start" x="925" y="-4207.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="998" y="-4207.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1003" y="-4207.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1099" y="-4207.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-4173 920,-4198 1186,-4198 1186,-4173 920,-4173"/>
+<text text-anchor="start" x="925" y="-4182.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="1004" y="-4182.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1009" y="-4182.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1105" y="-4182.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset&#45;&#45;task_outlet_asset_reference -->
+<g id="edge8" class="edge">
+<title>asset&#45;&#45;task_outlet_asset_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.18,-4562.71C762.18,-4544.71 786.45,-4523.99 806,-4501 856.9,-4441.15 824.96,-4397.04 879,-4340 888.78,-4329.68 900.01,-4320.32 911.94,-4311.89"/>
+<text text-anchor="start" x="880.94" y="-4300.69" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="737.18" y="-4551.51" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dataset_dag_run_queue -->
+<!-- asset_dag_run_queue -->
 <g id="node20" class="node">
-<title>dataset_dag_run_queue</title>
-<polygon fill="none" stroke="black" points="909.5,-3738 909.5,-3766 1215.5,-3766 1215.5,-3738 909.5,-3738"/>
-<text text-anchor="start" x="957" y="-3749.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset_dag_run_queue</text>
-<polygon fill="none" stroke="black" points="909.5,-3713 909.5,-3738 1215.5,-3738 1215.5,-3713 909.5,-3713"/>
-<text text-anchor="start" x="914.5" y="-3722.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dataset_id</text>
-<text text-anchor="start" x="986.5" y="-3722.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="991.5" y="-3722.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1068.5" y="-3722.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="909.5,-3688 909.5,-3713 1215.5,-3713 1215.5,-3688 909.5,-3688"/>
-<text text-anchor="start" x="914.5" y="-3697.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">target_dag_id</text>
-<text text-anchor="start" x="1008.5" y="-3697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1013.5" y="-3697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1134.5" y="-3697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="909.5,-3663 909.5,-3688 1215.5,-3688 1215.5,-3663 909.5,-3663"/>
-<text text-anchor="start" x="914.5" y="-3672.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="987.5" y="-3672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="992.5" y="-3672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1088.5" y="-3672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset&#45;&#45;dataset_dag_run_queue -->
-<g id="edge12" class="edge">
-<title>dataset&#45;&#45;dataset_dag_run_queue</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.12,-4106.06C762.96,-4089.74 787.56,-4069.82 806,-4046 881.04,-3949.06 795.59,-3869.85 879,-3780 885.64,-3772.85 893.11,-3766.49 901.15,-3760.82"/>
-<text text-anchor="start" x="870.15" y="-3749.62" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="737.12" y="-4098.61" font-family="Times,serif" font-size="14.00">1</text>
+<title>asset_dag_run_queue</title>
+<polygon fill="none" stroke="black" points="900,-4119 900,-4147 1206,-4147 1206,-4119 900,-4119"/>
+<text text-anchor="start" x="957" y="-4130.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_dag_run_queue</text>
+<polygon fill="none" stroke="black" points="900,-4094 900,-4119 1206,-4119 1206,-4094 900,-4094"/>
+<text text-anchor="start" x="905" y="-4103.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">asset_id</text>
+<text text-anchor="start" x="962" y="-4103.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="967" y="-4103.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1044" y="-4103.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="900,-4069 900,-4094 1206,-4094 1206,-4069 900,-4069"/>
+<text text-anchor="start" x="905" y="-4078.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">target_dag_id</text>
+<text text-anchor="start" x="999" y="-4078.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1004" y="-4078.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1125" y="-4078.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="900,-4044 900,-4069 1206,-4069 1206,-4044 900,-4044"/>
+<text text-anchor="start" x="905" y="-4053.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="978" y="-4053.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="983" y="-4053.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1079" y="-4053.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset&#45;&#45;asset_dag_run_queue -->
+<g id="edge9" class="edge">
+<title>asset&#45;&#45;asset_dag_run_queue</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M737.01,-4568.98C763.25,-4550.06 788.05,-4527.39 806,-4501 893.18,-4372.85 777.54,-4277.17 879,-4160 882.98,-4155.4 887.33,-4151.13 891.96,-4147.17"/>
+<text text-anchor="start" x="860.96" y="-4135.97" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="737.01" y="-4572.78" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dataset_event -->
+<!-- asset_event -->
 <g id="node21" class="node">
-<title>dataset_event</title>
-<polygon fill="none" stroke="black" points="465,-3142 465,-3170 727,-3170 727,-3142 465,-3142"/>
-<text text-anchor="start" x="532.5" y="-3153.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dataset_event</text>
-<polygon fill="none" stroke="black" points="465,-3117 465,-3142 727,-3142 727,-3117 465,-3117"/>
-<text text-anchor="start" x="470" y="-3126.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="483" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="488" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="565" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="465,-3092 465,-3117 727,-3117 727,-3092 465,-3092"/>
-<text text-anchor="start" x="470" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00">dataset_id</text>
-<text text-anchor="start" x="542" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="547" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="624" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="465,-3067 465,-3092 727,-3092 727,-3067 465,-3067"/>
-<text text-anchor="start" x="470" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00">extra</text>
-<text text-anchor="start" x="507" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="512" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<text text-anchor="start" x="563" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="465,-3042 465,-3067 727,-3067 727,-3042 465,-3042"/>
-<text text-anchor="start" x="470" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_dag_id</text>
-<text text-anchor="start" x="569" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="574" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="465,-3017 465,-3042 727,-3042 727,-3017 465,-3017"/>
-<text text-anchor="start" x="470" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_map_index</text>
-<text text-anchor="start" x="599" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="604" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="465,-2992 465,-3017 727,-3017 727,-2992 465,-2992"/>
-<text text-anchor="start" x="470" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_run_id</text>
-<text text-anchor="start" x="567" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="572" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="465,-2967 465,-2992 727,-2992 727,-2967 465,-2967"/>
-<text text-anchor="start" x="470" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_task_id</text>
-<text text-anchor="start" x="572" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="577" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="465,-2942 465,-2967 727,-2967 727,-2942 465,-2942"/>
-<text text-anchor="start" x="470" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
-<text text-anchor="start" x="545" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="550" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="646" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_event&#45;&#45;dataset_alias_dataset_event -->
-<g id="edge13" class="edge">
-<title>dataset_event&#45;&#45;dataset_alias_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.11,-3049.77C794.48,-3049.08 863.72,-3049.08 923.12,-3049.77"/>
-<text text-anchor="start" x="892.12" y="-3038.57" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.11" y="-3038.57" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- dataset_event&#45;&#45;dataset_alias_dataset_event -->
-<g id="edge14" class="edge">
-<title>dataset_event&#45;&#45;dataset_alias_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.11,-3062.23C794.48,-3062.92 863.72,-3062.92 923.12,-3062.23"/>
-<text text-anchor="start" x="892.12" y="-3051.03" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.11" y="-3066.03" font-family="Times,serif" font-size="14.00">1</text>
+<title>asset_event</title>
+<polygon fill="none" stroke="black" points="465,-3627 465,-3655 727,-3655 727,-3627 465,-3627"/>
+<text text-anchor="start" x="542.5" y="-3638.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">asset_event</text>
+<polygon fill="none" stroke="black" points="465,-3602 465,-3627 727,-3627 727,-3602 465,-3602"/>
+<text text-anchor="start" x="470" y="-3611.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="483" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="488" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="565" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="465,-3577 465,-3602 727,-3602 727,-3577 465,-3577"/>
+<text text-anchor="start" x="470" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00">asset_id</text>
+<text text-anchor="start" x="527" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="532" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="609" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="465,-3552 465,-3577 727,-3577 727,-3552 465,-3552"/>
+<text text-anchor="start" x="470" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00">extra</text>
+<text text-anchor="start" x="507" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="512" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<text text-anchor="start" x="563" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="465,-3527 465,-3552 727,-3552 727,-3527 465,-3527"/>
+<text text-anchor="start" x="470" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_dag_id</text>
+<text text-anchor="start" x="569" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="574" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="465,-3502 465,-3527 727,-3527 727,-3502 465,-3502"/>
+<text text-anchor="start" x="470" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_map_index</text>
+<text text-anchor="start" x="599" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="604" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="465,-3477 465,-3502 727,-3502 727,-3477 465,-3477"/>
+<text text-anchor="start" x="470" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_run_id</text>
+<text text-anchor="start" x="567" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="572" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="465,-3452 465,-3477 727,-3477 727,-3452 465,-3452"/>
+<text text-anchor="start" x="470" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00">source_task_id</text>
+<text text-anchor="start" x="572" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="577" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="465,-3427 465,-3452 727,-3452 727,-3427 465,-3427"/>
+<text text-anchor="start" x="470" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
+<text text-anchor="start" x="545" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="550" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="646" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_event&#45;&#45;asset_alias_asset_event -->
+<g id="edge10" class="edge">
+<title>asset_event&#45;&#45;asset_alias_asset_event</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.06,-3556.17C797.69,-3563.05 871.08,-3571.12 931.45,-3577.75"/>
+<text text-anchor="start" x="900.45" y="-3566.55" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="735.06" y="-3544.97" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dagrun_dataset_event -->
+<!-- dagrun_asset_event -->
 <g id="node22" class="node">
-<title>dagrun_dataset_event</title>
-<polygon fill="none" stroke="black" points="940.5,-2963 940.5,-2991 1185.5,-2991 1185.5,-2963 940.5,-2963"/>
-<text text-anchor="start" x="963.5" y="-2974.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dagrun_dataset_event</text>
-<polygon fill="none" stroke="black" points="940.5,-2938 940.5,-2963 1185.5,-2963 1185.5,-2938 940.5,-2938"/>
-<text text-anchor="start" x="945.5" y="-2947.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
-<text text-anchor="start" x="1022.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1027.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1104.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="940.5,-2913 940.5,-2938 1185.5,-2938 1185.5,-2913 940.5,-2913"/>
-<text text-anchor="start" x="945.5" y="-2922.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">event_id</text>
-<text text-anchor="start" x="1004.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1009.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1086.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-</g>
-<!-- dataset_event&#45;&#45;dagrun_dataset_event -->
-<g id="edge15" class="edge">
-<title>dataset_event&#45;&#45;dagrun_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.11,-3025.08C797.42,-3011.13 870.61,-2994.74 931.88,-2981.02"/>
-<text text-anchor="start" x="900.88" y="-2969.82" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="735.11" y="-3013.88" font-family="Times,serif" font-size="14.00">1</text>
+<title>dagrun_asset_event</title>
+<polygon fill="none" stroke="black" points="931,-3498 931,-3526 1176,-3526 1176,-3498 931,-3498"/>
+<text text-anchor="start" x="964" y="-3509.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dagrun_asset_event</text>
+<polygon fill="none" stroke="black" points="931,-3473 931,-3498 1176,-3498 1176,-3473 931,-3473"/>
+<text text-anchor="start" x="936" y="-3482.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
+<text text-anchor="start" x="1013" y="-3482.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1018" y="-3482.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1095" y="-3482.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="931,-3448 931,-3473 1176,-3473 1176,-3448 931,-3448"/>
+<text text-anchor="start" x="936" y="-3457.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">event_id</text>
+<text text-anchor="start" x="995" y="-3457.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1000" y="-3457.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1077" y="-3457.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+</g>
+<!-- asset_event&#45;&#45;dagrun_asset_event -->
+<g id="edge11" class="edge">
+<title>asset_event&#45;&#45;dagrun_asset_event</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M735.06,-3524.61C794.55,-3517.55 863.75,-3509.34 922.28,-3502.4"/>
+<text text-anchor="start" x="891.28" y="-3491.2" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="735.06" y="-3513.41" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag -->
 <g id="node23" class="node">
 <title>dag</title>
-<polygon fill="none" stroke="black" points="394,-3877 394,-3905 798,-3905 798,-3877 394,-3877"/>
-<text text-anchor="start" x="579" y="-3888.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag</text>
-<polygon fill="none" stroke="black" points="394,-3852 394,-3877 798,-3877 798,-3852 394,-3852"/>
-<text text-anchor="start" x="399" y="-3861.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="445" y="-3861.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="450" y="-3861.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="571" y="-3861.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="394,-3827 394,-3852 798,-3852 798,-3827 394,-3827"/>
-<text text-anchor="start" x="399" y="-3836.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_display_name</text>
-<text text-anchor="start" x="528" y="-3836.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="533" y="-3836.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="394,-3802 394,-3827 798,-3827 798,-3802 394,-3802"/>
-<text text-anchor="start" x="399" y="-3811.8" font-family="Helvetica,sans-Serif" font-size="14.00">dataset_expression</text>
-<text text-anchor="start" x="533" y="-3811.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="538" y="-3811.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="394,-3777 394,-3802 798,-3802 798,-3777 394,-3777"/>
-<text text-anchor="start" x="399" y="-3786.8" font-family="Helvetica,sans-Serif" font-size="14.00">default_view</text>
-<text text-anchor="start" x="487" y="-3786.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="492" y="-3786.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(25)]</text>
-<polygon fill="none" stroke="black" points="394,-3752 394,-3777 798,-3777 798,-3752 394,-3752"/>
-<text text-anchor="start" x="399" y="-3761.8" font-family="Helvetica,sans-Serif" font-size="14.00">description</text>
-<text text-anchor="start" x="477" y="-3761.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="482" y="-3761.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-<polygon fill="none" stroke="black" points="394,-3727 394,-3752 798,-3752 798,-3727 394,-3727"/>
-<text text-anchor="start" x="399" y="-3736.8" font-family="Helvetica,sans-Serif" font-size="14.00">fileloc</text>
-<text text-anchor="start" x="440" y="-3736.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="445" y="-3736.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="394,-3702 394,-3727 798,-3727 798,-3702 394,-3702"/>
-<text text-anchor="start" x="399" y="-3711.8" font-family="Helvetica,sans-Serif" font-size="14.00">has_import_errors</text>
-<text text-anchor="start" x="524" y="-3711.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="529" y="-3711.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="394,-3677 394,-3702 798,-3702 798,-3677 394,-3677"/>
-<text text-anchor="start" x="399" y="-3686.8" font-family="Helvetica,sans-Serif" font-size="14.00">has_task_concurrency_limits</text>
-<text text-anchor="start" x="596" y="-3686.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="601" y="-3686.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<text text-anchor="start" x="685" y="-3686.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="394,-3652 394,-3677 798,-3677 798,-3652 394,-3652"/>
-<text text-anchor="start" x="399" y="-3661.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_active</text>
-<text text-anchor="start" x="459" y="-3661.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="464" y="-3661.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="394,-3627 394,-3652 798,-3652 798,-3627 394,-3627"/>
-<text text-anchor="start" x="399" y="-3636.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_paused</text>
-<text text-anchor="start" x="469" y="-3636.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="474" y="-3636.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="394,-3602 394,-3627 798,-3627 798,-3602 394,-3602"/>
-<text text-anchor="start" x="399" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_expired</text>
-<text text-anchor="start" x="483" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="488" y="-3611.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3577 394,-3602 798,-3602 798,-3577 394,-3577"/>
-<text text-anchor="start" x="399" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_parsed_time</text>
-<text text-anchor="start" x="517" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="522" y="-3586.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3552 394,-3577 798,-3577 798,-3552 394,-3552"/>
-<text text-anchor="start" x="399" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_pickled</text>
-<text text-anchor="start" x="481" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="486" y="-3561.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3527 394,-3552 798,-3552 798,-3527 394,-3527"/>
-<text text-anchor="start" x="399" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_runs</text>
-<text text-anchor="start" x="516" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="521" y="-3536.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="394,-3502 394,-3527 798,-3527 798,-3502 394,-3502"/>
-<text text-anchor="start" x="399" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_tasks</text>
-<text text-anchor="start" x="521" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="526" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="603" y="-3511.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="394,-3477 394,-3502 798,-3502 798,-3477 394,-3477"/>
-<text text-anchor="start" x="399" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_consecutive_failed_dag_runs</text>
-<text text-anchor="start" x="635" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="640" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="717" y="-3486.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="394,-3452 394,-3477 798,-3477 798,-3452 394,-3452"/>
-<text text-anchor="start" x="399" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun</text>
-<text text-anchor="start" x="487" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="492" y="-3461.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3427 394,-3452 798,-3452 798,-3427 394,-3427"/>
-<text text-anchor="start" x="399" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_create_after</text>
-<text text-anchor="start" x="576" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="581" y="-3436.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3402 394,-3427 798,-3427 798,-3402 394,-3402"/>
-<text text-anchor="start" x="399" y="-3411.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_data_interval_end</text>
-<text text-anchor="start" x="617" y="-3411.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="622" y="-3411.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3377 394,-3402 798,-3402 798,-3377 394,-3377"/>
-<text text-anchor="start" x="399" y="-3386.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_data_interval_start</text>
-<text text-anchor="start" x="623" y="-3386.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="628" y="-3386.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="394,-3352 394,-3377 798,-3377 798,-3352 394,-3352"/>
-<text text-anchor="start" x="399" y="-3361.8" font-family="Helvetica,sans-Serif" font-size="14.00">owners</text>
-<text text-anchor="start" x="450" y="-3361.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="455" y="-3361.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="394,-3327 394,-3352 798,-3352 798,-3327 394,-3327"/>
-<text text-anchor="start" x="399" y="-3336.8" font-family="Helvetica,sans-Serif" font-size="14.00">pickle_id</text>
-<text text-anchor="start" x="460" y="-3336.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="465" y="-3336.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="394,-3302 394,-3327 798,-3327 798,-3302 394,-3302"/>
-<text text-anchor="start" x="399" y="-3311.8" font-family="Helvetica,sans-Serif" font-size="14.00">processor_subdir</text>
-<text text-anchor="start" x="518" y="-3311.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="523" y="-3311.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="394,-3277 394,-3302 798,-3302 798,-3277 394,-3277"/>
-<text text-anchor="start" x="399" y="-3286.8" font-family="Helvetica,sans-Serif" font-size="14.00">scheduler_lock</text>
-<text text-anchor="start" x="502" y="-3286.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="507" y="-3286.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="394,-3252 394,-3277 798,-3277 798,-3252 394,-3252"/>
-<text text-anchor="start" x="399" y="-3261.8" font-family="Helvetica,sans-Serif" font-size="14.00">timetable_description</text>
-<text text-anchor="start" x="549" y="-3261.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="554" y="-3261.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="394,-3227 394,-3252 798,-3252 798,-3227 394,-3227"/>
-<text text-anchor="start" x="399" y="-3236.8" font-family="Helvetica,sans-Serif" font-size="14.00">timetable_summary</text>
-<text text-anchor="start" x="538" y="-3236.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="543" y="-3236.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-</g>
-<!-- dag&#45;&#45;dag_schedule_dataset_alias_reference -->
-<g id="edge16" class="edge">
-<title>dag&#45;&#45;dag_schedule_dataset_alias_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.15,-3569.15C830.35,-3569.52 854.89,-3569.89 878.7,-3570.25"/>
-<text text-anchor="start" x="847.7" y="-3559.05" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.15" y="-3557.95" font-family="Times,serif" font-size="14.00">1</text>
+<polygon fill="none" stroke="black" points="394,-4332 394,-4360 798,-4360 798,-4332 394,-4332"/>
+<text text-anchor="start" x="579" y="-4343.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag</text>
+<polygon fill="none" stroke="black" points="394,-4307 394,-4332 798,-4332 798,-4307 394,-4307"/>
+<text text-anchor="start" x="399" y="-4316.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="445" y="-4316.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="450" y="-4316.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="571" y="-4316.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="394,-4282 394,-4307 798,-4307 798,-4282 394,-4282"/>
+<text text-anchor="start" x="399" y="-4291.8" font-family="Helvetica,sans-Serif" font-size="14.00">asset_expression</text>
+<text text-anchor="start" x="518" y="-4291.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="523" y="-4291.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="394,-4257 394,-4282 798,-4282 798,-4257 394,-4257"/>
+<text text-anchor="start" x="399" y="-4266.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_display_name</text>
+<text text-anchor="start" x="528" y="-4266.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="533" y="-4266.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="394,-4232 394,-4257 798,-4257 798,-4232 394,-4232"/>
+<text text-anchor="start" x="399" y="-4241.8" font-family="Helvetica,sans-Serif" font-size="14.00">default_view</text>
+<text text-anchor="start" x="487" y="-4241.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="492" y="-4241.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(25)]</text>
+<polygon fill="none" stroke="black" points="394,-4207 394,-4232 798,-4232 798,-4207 394,-4207"/>
+<text text-anchor="start" x="399" y="-4216.8" font-family="Helvetica,sans-Serif" font-size="14.00">description</text>
+<text text-anchor="start" x="477" y="-4216.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="482" y="-4216.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+<polygon fill="none" stroke="black" points="394,-4182 394,-4207 798,-4207 798,-4182 394,-4182"/>
+<text text-anchor="start" x="399" y="-4191.8" font-family="Helvetica,sans-Serif" font-size="14.00">fileloc</text>
+<text text-anchor="start" x="440" y="-4191.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="445" y="-4191.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="394,-4157 394,-4182 798,-4182 798,-4157 394,-4157"/>
+<text text-anchor="start" x="399" y="-4166.8" font-family="Helvetica,sans-Serif" font-size="14.00">has_import_errors</text>
+<text text-anchor="start" x="524" y="-4166.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="529" y="-4166.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="394,-4132 394,-4157 798,-4157 798,-4132 394,-4132"/>
+<text text-anchor="start" x="399" y="-4141.8" font-family="Helvetica,sans-Serif" font-size="14.00">has_task_concurrency_limits</text>
+<text text-anchor="start" x="596" y="-4141.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="601" y="-4141.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<text text-anchor="start" x="685" y="-4141.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="394,-4107 394,-4132 798,-4132 798,-4107 394,-4107"/>
+<text text-anchor="start" x="399" y="-4116.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_active</text>
+<text text-anchor="start" x="459" y="-4116.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="464" y="-4116.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="394,-4082 394,-4107 798,-4107 798,-4082 394,-4082"/>
+<text text-anchor="start" x="399" y="-4091.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_paused</text>
+<text text-anchor="start" x="469" y="-4091.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="474" y="-4091.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="394,-4057 394,-4082 798,-4082 798,-4057 394,-4057"/>
+<text text-anchor="start" x="399" y="-4066.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_expired</text>
+<text text-anchor="start" x="483" y="-4066.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="488" y="-4066.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-4032 394,-4057 798,-4057 798,-4032 394,-4032"/>
+<text text-anchor="start" x="399" y="-4041.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_parsed_time</text>
+<text text-anchor="start" x="517" y="-4041.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="522" y="-4041.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-4007 394,-4032 798,-4032 798,-4007 394,-4007"/>
+<text text-anchor="start" x="399" y="-4016.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_pickled</text>
+<text text-anchor="start" x="481" y="-4016.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="486" y="-4016.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-3982 394,-4007 798,-4007 798,-3982 394,-3982"/>
+<text text-anchor="start" x="399" y="-3991.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_runs</text>
+<text text-anchor="start" x="516" y="-3991.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="521" y="-3991.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="394,-3957 394,-3982 798,-3982 798,-3957 394,-3957"/>
+<text text-anchor="start" x="399" y="-3966.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_tasks</text>
+<text text-anchor="start" x="521" y="-3966.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="526" y="-3966.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="603" y="-3966.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="394,-3932 394,-3957 798,-3957 798,-3932 394,-3932"/>
+<text text-anchor="start" x="399" y="-3941.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_consecutive_failed_dag_runs</text>
+<text text-anchor="start" x="635" y="-3941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="640" y="-3941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="717" y="-3941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="394,-3907 394,-3932 798,-3932 798,-3907 394,-3907"/>
+<text text-anchor="start" x="399" y="-3916.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun</text>
+<text text-anchor="start" x="487" y="-3916.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="492" y="-3916.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-3882 394,-3907 798,-3907 798,-3882 394,-3882"/>
+<text text-anchor="start" x="399" y="-3891.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_create_after</text>
+<text text-anchor="start" x="576" y="-3891.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="581" y="-3891.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-3857 394,-3882 798,-3882 798,-3857 394,-3857"/>
+<text text-anchor="start" x="399" y="-3866.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_data_interval_end</text>
+<text text-anchor="start" x="617" y="-3866.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="622" y="-3866.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-3832 394,-3857 798,-3857 798,-3832 394,-3832"/>
+<text text-anchor="start" x="399" y="-3841.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_dagrun_data_interval_start</text>
+<text text-anchor="start" x="623" y="-3841.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="628" y="-3841.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="394,-3807 394,-3832 798,-3832 798,-3807 394,-3807"/>
+<text text-anchor="start" x="399" y="-3816.8" font-family="Helvetica,sans-Serif" font-size="14.00">owners</text>
+<text text-anchor="start" x="450" y="-3816.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="455" y="-3816.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="394,-3782 394,-3807 798,-3807 798,-3782 394,-3782"/>
+<text text-anchor="start" x="399" y="-3791.8" font-family="Helvetica,sans-Serif" font-size="14.00">pickle_id</text>
+<text text-anchor="start" x="460" y="-3791.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="465" y="-3791.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="394,-3757 394,-3782 798,-3782 798,-3757 394,-3757"/>
+<text text-anchor="start" x="399" y="-3766.8" font-family="Helvetica,sans-Serif" font-size="14.00">processor_subdir</text>
+<text text-anchor="start" x="518" y="-3766.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="523" y="-3766.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="394,-3732 394,-3757 798,-3757 798,-3732 394,-3732"/>
+<text text-anchor="start" x="399" y="-3741.8" font-family="Helvetica,sans-Serif" font-size="14.00">scheduler_lock</text>
+<text text-anchor="start" x="502" y="-3741.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="507" y="-3741.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="394,-3707 394,-3732 798,-3732 798,-3707 394,-3707"/>
+<text text-anchor="start" x="399" y="-3716.8" font-family="Helvetica,sans-Serif" font-size="14.00">timetable_description</text>
+<text text-anchor="start" x="549" y="-3716.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="554" y="-3716.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="394,-3682 394,-3707 798,-3707 798,-3682 394,-3682"/>
+<text text-anchor="start" x="399" y="-3691.8" font-family="Helvetica,sans-Serif" font-size="14.00">timetable_summary</text>
+<text text-anchor="start" x="538" y="-3691.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="543" y="-3691.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+</g>
+<!-- dag&#45;&#45;dag_schedule_asset_alias_reference -->
+<g id="edge12" class="edge">
+<title>dag&#45;&#45;dag_schedule_asset_alias_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.39,-4277.62C829.68,-4299.73 854.04,-4320.63 879,-4339 883.64,-4342.42 888.46,-4345.73 893.41,-4348.94"/>
+<text text-anchor="start" x="862.41" y="-4337.74" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.39" y="-4266.42" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dag&#45;&#45;dag_schedule_dataset_reference -->
-<g id="edge17" class="edge">
-<title>dag&#45;&#45;dag_schedule_dataset_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.06,-3732.53C830.11,-3749.07 854.72,-3764.92 879,-3779 886.75,-3783.49 894.81,-3787.88 903.03,-3792.13"/>
-<text text-anchor="start" x="872.03" y="-3780.93" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.06" y="-3721.33" font-family="Times,serif" font-size="14.00">1</text>
+<!-- dag&#45;&#45;dag_schedule_asset_reference -->
+<g id="edge13" class="edge">
+<title>dag&#45;&#45;dag_schedule_asset_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M801.44,-4364.16C845.26,-4437.66 878.75,-4493.78 879,-4494 886.62,-4500.77 894.93,-4507.02 903.66,-4512.79"/>
+<text text-anchor="start" x="872.66" y="-4501.59" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="791.44" y="-4367.96" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dag&#45;&#45;task_outlet_dataset_reference -->
-<g id="edge18" class="edge">
-<title>dag&#45;&#45;task_outlet_dataset_reference</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.08,-3864.85C829.23,-3889.67 853.65,-3913.18 879,-3934 889.78,-3942.86 901.58,-3951.12 913.83,-3958.77"/>
-<text text-anchor="start" x="882.83" y="-3947.57" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.08" y="-3853.65" font-family="Times,serif" font-size="14.00">1</text>
+<!-- dag&#45;&#45;task_outlet_asset_reference -->
+<g id="edge14" class="edge">
+<title>dag&#45;&#45;task_outlet_asset_reference</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.19,-4126.28C842.02,-4144.32 878.46,-4162.66 911.92,-4179.5"/>
+<text text-anchor="start" x="880.92" y="-4168.3" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.19" y="-4115.08" font-family="Times,serif" font-size="14.00">1</text>
 </g>
-<!-- dag&#45;&#45;dataset_dag_run_queue -->
-<g id="edge19" class="edge">
-<title>dag&#45;&#45;dataset_dag_run_queue</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.15,-3633.09C838.06,-3643.32 870.55,-3653.75 901.19,-3663.58"/>
-<text text-anchor="start" x="870.19" y="-3667.38" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.15" y="-3621.89" font-family="Times,serif" font-size="14.00">1</text>
+<!-- dag&#45;&#45;asset_dag_run_queue -->
+<g id="edge15" class="edge">
+<title>dag&#45;&#45;asset_dag_run_queue</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.19,-4055.48C835.02,-4060.23 864.24,-4065.05 891.99,-4069.62"/>
+<text text-anchor="start" x="860.99" y="-4058.42" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.19" y="-4044.28" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag_tag -->
 <g id="node24" class="node">
 <title>dag_tag</title>
-<polygon fill="none" stroke="black" points="933.5,-3455 933.5,-3483 1191.5,-3483 1191.5,-3455 933.5,-3455"/>
-<text text-anchor="start" x="1027" y="-3466.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_tag</text>
-<polygon fill="none" stroke="black" points="933.5,-3430 933.5,-3455 1191.5,-3455 1191.5,-3430 933.5,-3430"/>
-<text text-anchor="start" x="938.5" y="-3439.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="984.5" y="-3439.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="989.5" y="-3439.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1110.5" y="-3439.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="933.5,-3405 933.5,-3430 1191.5,-3430 1191.5,-3405 933.5,-3405"/>
-<text text-anchor="start" x="938.5" y="-3414.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">name</text>
-<text text-anchor="start" x="978.5" y="-3414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="983.5" y="-3414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(100)]</text>
-<text text-anchor="start" x="1104.5" y="-3414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="924,-3990 924,-4018 1182,-4018 1182,-3990 924,-3990"/>
+<text text-anchor="start" x="1017.5" y="-4001.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_tag</text>
+<polygon fill="none" stroke="black" points="924,-3965 924,-3990 1182,-3990 1182,-3965 924,-3965"/>
+<text text-anchor="start" x="929" y="-3974.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="975" y="-3974.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="980" y="-3974.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1101" y="-3974.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="924,-3940 924,-3965 1182,-3965 1182,-3940 924,-3940"/>
+<text text-anchor="start" x="929" y="-3949.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">name</text>
+<text text-anchor="start" x="969" y="-3949.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="974" y="-3949.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(100)]</text>
+<text text-anchor="start" x="1095" y="-3949.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag&#45;&#45;dag_tag -->
-<g id="edge20" class="edge">
+<g id="edge16" class="edge">
 <title>dag&#45;&#45;dag_tag</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.15,-3511.07C846.6,-3500.44 888,-3489.57 925.37,-3479.75"/>
-<text text-anchor="start" x="894.37" y="-3468.55" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.15" y="-3499.87" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.19,-4001.69C843.42,-3998.25 881.31,-3994.76 915.83,-3991.57"/>
+<text text-anchor="start" x="884.83" y="-3980.37" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.19" y="-3990.49" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag_owner_attributes -->
 <g id="node25" class="node">
 <title>dag_owner_attributes</title>
-<polygon fill="none" stroke="black" points="933.5,-3350 933.5,-3378 1191.5,-3378 1191.5,-3350 933.5,-3350"/>
-<text text-anchor="start" x="964.5" y="-3361.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_owner_attributes</text>
-<polygon fill="none" stroke="black" points="933.5,-3325 933.5,-3350 1191.5,-3350 1191.5,-3325 933.5,-3325"/>
-<text text-anchor="start" x="938.5" y="-3334.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="984.5" y="-3334.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="989.5" y="-3334.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1110.5" y="-3334.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="933.5,-3300 933.5,-3325 1191.5,-3325 1191.5,-3300 933.5,-3300"/>
-<text text-anchor="start" x="938.5" y="-3309.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">owner</text>
-<text text-anchor="start" x="981.5" y="-3309.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="986.5" y="-3309.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(500)]</text>
-<text text-anchor="start" x="1107.5" y="-3309.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="933.5,-3275 933.5,-3300 1191.5,-3300 1191.5,-3275 933.5,-3275"/>
-<text text-anchor="start" x="938.5" y="-3284.8" font-family="Helvetica,sans-Serif" font-size="14.00">link</text>
-<text text-anchor="start" x="963.5" y="-3284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="968.5" y="-3284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(500)]</text>
-<text text-anchor="start" x="1089.5" y="-3284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="924,-3885 924,-3913 1182,-3913 1182,-3885 924,-3885"/>
+<text text-anchor="start" x="955" y="-3896.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_owner_attributes</text>
+<polygon fill="none" stroke="black" points="924,-3860 924,-3885 1182,-3885 1182,-3860 924,-3860"/>
+<text text-anchor="start" x="929" y="-3869.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="975" y="-3869.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="980" y="-3869.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1101" y="-3869.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="924,-3835 924,-3860 1182,-3860 1182,-3835 924,-3835"/>
+<text text-anchor="start" x="929" y="-3844.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">owner</text>
+<text text-anchor="start" x="972" y="-3844.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="977" y="-3844.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(500)]</text>
+<text text-anchor="start" x="1098" y="-3844.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="924,-3810 924,-3835 1182,-3835 1182,-3810 924,-3810"/>
+<text text-anchor="start" x="929" y="-3819.8" font-family="Helvetica,sans-Serif" font-size="14.00">link</text>
+<text text-anchor="start" x="954" y="-3819.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="959" y="-3819.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(500)]</text>
+<text text-anchor="start" x="1080" y="-3819.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag&#45;&#45;dag_owner_attributes -->
-<g id="edge21" class="edge">
+<g id="edge17" class="edge">
 <title>dag&#45;&#45;dag_owner_attributes</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.01,-3430.39C830.22,-3416.69 854.88,-3403.58 879,-3392 893.71,-3384.94 909.39,-3378.22 925.15,-3371.97"/>
-<text text-anchor="start" x="894.15" y="-3360.77" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.01" y="-3419.19" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.19,-3947.9C843.42,-3934.89 881.31,-3921.65 915.83,-3909.58"/>
+<text text-anchor="start" x="884.83" y="-3898.38" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.19" y="-3936.7" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag_warning -->
 <g id="node26" class="node">
 <title>dag_warning</title>
-<polygon fill="none" stroke="black" points="914.5,-3221 914.5,-3249 1211.5,-3249 1211.5,-3221 914.5,-3221"/>
-<text text-anchor="start" x="1005.5" y="-3232.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_warning</text>
-<polygon fill="none" stroke="black" points="914.5,-3196 914.5,-3221 1211.5,-3221 1211.5,-3196 914.5,-3196"/>
-<text text-anchor="start" x="919.5" y="-3205.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="965.5" y="-3205.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="970.5" y="-3205.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1091.5" y="-3205.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="914.5,-3171 914.5,-3196 1211.5,-3196 1211.5,-3171 914.5,-3171"/>
-<text text-anchor="start" x="919.5" y="-3180.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">warning_type</text>
-<text text-anchor="start" x="1013.5" y="-3180.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1018.5" y="-3180.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
-<text text-anchor="start" x="1130.5" y="-3180.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="914.5,-3146 914.5,-3171 1211.5,-3171 1211.5,-3146 914.5,-3146"/>
-<text text-anchor="start" x="919.5" y="-3155.8" font-family="Helvetica,sans-Serif" font-size="14.00">message</text>
-<text text-anchor="start" x="982.5" y="-3155.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="987.5" y="-3155.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-<text text-anchor="start" x="1037.5" y="-3155.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="914.5,-3121 914.5,-3146 1211.5,-3146 1211.5,-3121 914.5,-3121"/>
-<text text-anchor="start" x="919.5" y="-3130.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
-<text text-anchor="start" x="994.5" y="-3130.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="999.5" y="-3130.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1095.5" y="-3130.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="905,-3756 905,-3784 1202,-3784 1202,-3756 905,-3756"/>
+<text text-anchor="start" x="996" y="-3767.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_warning</text>
+<polygon fill="none" stroke="black" points="905,-3731 905,-3756 1202,-3756 1202,-3731 905,-3731"/>
+<text text-anchor="start" x="910" y="-3740.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="956" y="-3740.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="961" y="-3740.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1082" y="-3740.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="905,-3706 905,-3731 1202,-3731 1202,-3706 905,-3706"/>
+<text text-anchor="start" x="910" y="-3715.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">warning_type</text>
+<text text-anchor="start" x="1004" y="-3715.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1009" y="-3715.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
+<text text-anchor="start" x="1121" y="-3715.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="905,-3681 905,-3706 1202,-3706 1202,-3681 905,-3681"/>
+<text text-anchor="start" x="910" y="-3690.8" font-family="Helvetica,sans-Serif" font-size="14.00">message</text>
+<text text-anchor="start" x="973" y="-3690.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="978" y="-3690.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+<text text-anchor="start" x="1028" y="-3690.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="905,-3656 905,-3681 1202,-3681 1202,-3656 905,-3656"/>
+<text text-anchor="start" x="910" y="-3665.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
+<text text-anchor="start" x="985" y="-3665.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="990" y="-3665.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1086" y="-3665.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag&#45;&#45;dag_warning -->
-<g id="edge22" class="edge">
+<g id="edge18" class="edge">
 <title>dag&#45;&#45;dag_warning</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.39,-3320.61C829.72,-3299.42 854.09,-3279.45 879,-3262 887.45,-3256.08 896.42,-3250.49 905.69,-3245.24"/>
-<text text-anchor="start" x="874.69" y="-3234.04" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="806.39" y="-3309.41" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M806.1,-3845.63C830.09,-3828.33 854.67,-3811.75 879,-3797 884.62,-3793.59 890.42,-3790.25 896.34,-3786.97"/>
+<text text-anchor="start" x="865.34" y="-3775.77" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="806.1" y="-3834.43" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- log_template -->
 <g id="node27" class="node">
 <title>log_template</title>
-<polygon fill="none" stroke="black" points="26.5,-2525 26.5,-2553 286.5,-2553 286.5,-2525 26.5,-2525"/>
-<text text-anchor="start" x="98.5" y="-2536.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">log_template</text>
-<polygon fill="none" stroke="black" points="26.5,-2500 26.5,-2525 286.5,-2525 286.5,-2500 26.5,-2500"/>
-<text text-anchor="start" x="31.5" y="-2509.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="44.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="49.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="126.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="26.5,-2475 26.5,-2500 286.5,-2500 286.5,-2475 26.5,-2475"/>
-<text text-anchor="start" x="31.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="104.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="109.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="205.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="26.5,-2450 26.5,-2475 286.5,-2475 286.5,-2450 26.5,-2450"/>
-<text text-anchor="start" x="31.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00">elasticsearch_id</text>
-<text text-anchor="start" x="141.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="146.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-<text text-anchor="start" x="196.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="26.5,-2425 26.5,-2450 286.5,-2450 286.5,-2425 26.5,-2425"/>
-<text text-anchor="start" x="31.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00">filename</text>
-<text text-anchor="start" x="92.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="97.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-<text text-anchor="start" x="147.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="26.5,-2988 26.5,-3016 286.5,-3016 286.5,-2988 26.5,-2988"/>
+<text text-anchor="start" x="98.5" y="-2999.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">log_template</text>
+<polygon fill="none" stroke="black" points="26.5,-2963 26.5,-2988 286.5,-2988 286.5,-2963 26.5,-2963"/>
+<text text-anchor="start" x="31.5" y="-2972.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="44.5" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="49.5" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="126.5" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="26.5,-2938 26.5,-2963 286.5,-2963 286.5,-2938 26.5,-2938"/>
+<text text-anchor="start" x="31.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="104.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="109.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="205.5" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="26.5,-2913 26.5,-2938 286.5,-2938 286.5,-2913 26.5,-2913"/>
+<text text-anchor="start" x="31.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00">elasticsearch_id</text>
+<text text-anchor="start" x="141.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="146.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+<text text-anchor="start" x="196.5" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="26.5,-2888 26.5,-2913 286.5,-2913 286.5,-2888 26.5,-2888"/>
+<text text-anchor="start" x="31.5" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00">filename</text>
+<text text-anchor="start" x="92.5" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="97.5" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+<text text-anchor="start" x="147.5" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag_run -->
 <g id="node28" class="node">
 <title>dag_run</title>
-<polygon fill="none" stroke="black" points="455,-2737 455,-2765 738,-2765 738,-2737 455,-2737"/>
-<text text-anchor="start" x="560" y="-2748.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_run</text>
-<polygon fill="none" stroke="black" points="455,-2712 455,-2737 738,-2737 738,-2712 455,-2712"/>
-<text text-anchor="start" x="460" y="-2721.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="473" y="-2721.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="478" y="-2721.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="555" y="-2721.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2687 455,-2712 738,-2712 738,-2687 455,-2687"/>
-<text text-anchor="start" x="460" y="-2696.8" font-family="Helvetica,sans-Serif" font-size="14.00">backfill_id</text>
-<text text-anchor="start" x="530" y="-2696.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="535" y="-2696.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="455,-2662 455,-2687 738,-2687 738,-2662 455,-2662"/>
-<text text-anchor="start" x="460" y="-2671.8" font-family="Helvetica,sans-Serif" font-size="14.00">clear_number</text>
-<text text-anchor="start" x="556" y="-2671.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="561" y="-2671.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="638" y="-2671.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2637 455,-2662 738,-2662 738,-2637 455,-2637"/>
-<text text-anchor="start" x="460" y="-2646.8" font-family="Helvetica,sans-Serif" font-size="14.00">conf</text>
-<text text-anchor="start" x="491" y="-2646.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="496" y="-2646.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
-<polygon fill="none" stroke="black" points="455,-2612 455,-2637 738,-2637 738,-2612 455,-2612"/>
-<text text-anchor="start" x="460" y="-2621.8" font-family="Helvetica,sans-Serif" font-size="14.00">creating_job_id</text>
-<text text-anchor="start" x="564" y="-2621.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="569" y="-2621.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="455,-2587 455,-2612 738,-2612 738,-2587 455,-2587"/>
-<text text-anchor="start" x="460" y="-2596.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_hash</text>
-<text text-anchor="start" x="527" y="-2596.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="532" y="-2596.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
-<polygon fill="none" stroke="black" points="455,-2562 455,-2587 738,-2587 738,-2562 455,-2562"/>
-<text text-anchor="start" x="460" y="-2571.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="506" y="-2571.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="511" y="-2571.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="632" y="-2571.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2537 455,-2562 738,-2562 738,-2537 455,-2537"/>
-<text text-anchor="start" x="460" y="-2546.8" font-family="Helvetica,sans-Serif" font-size="14.00">data_interval_end</text>
-<text text-anchor="start" x="584" y="-2546.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="589" y="-2546.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2512 455,-2537 738,-2537 738,-2512 455,-2512"/>
-<text text-anchor="start" x="460" y="-2521.8" font-family="Helvetica,sans-Serif" font-size="14.00">data_interval_start</text>
-<text text-anchor="start" x="590" y="-2521.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="595" y="-2521.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2487 455,-2512 738,-2512 738,-2487 455,-2487"/>
-<text text-anchor="start" x="460" y="-2496.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
-<text text-anchor="start" x="524" y="-2496.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="529" y="-2496.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2462 455,-2487 738,-2487 738,-2462 455,-2462"/>
-<text text-anchor="start" x="460" y="-2471.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_trigger</text>
-<text text-anchor="start" x="571" y="-2471.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="576" y="-2471.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="455,-2437 455,-2462 738,-2462 738,-2437 455,-2437"/>
-<text text-anchor="start" x="460" y="-2446.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_scheduling_decision</text>
-<text text-anchor="start" x="632" y="-2446.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="637" y="-2446.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2412 455,-2437 738,-2437 738,-2412 455,-2412"/>
-<text text-anchor="start" x="460" y="-2421.8" font-family="Helvetica,sans-Serif" font-size="14.00">log_template_id</text>
-<text text-anchor="start" x="569" y="-2421.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="574" y="-2421.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="455,-2387 455,-2412 738,-2412 738,-2387 455,-2387"/>
-<text text-anchor="start" x="460" y="-2396.8" font-family="Helvetica,sans-Serif" font-size="14.00">logical_date</text>
-<text text-anchor="start" x="542" y="-2396.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="547" y="-2396.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="643" y="-2396.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2362 455,-2387 738,-2387 738,-2362 455,-2362"/>
-<text text-anchor="start" x="460" y="-2371.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_at</text>
-<text text-anchor="start" x="533" y="-2371.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="538" y="-2371.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2337 455,-2362 738,-2362 738,-2337 455,-2337"/>
-<text text-anchor="start" x="460" y="-2346.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
-<text text-anchor="start" x="504" y="-2346.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="509" y="-2346.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="630" y="-2346.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2312 455,-2337 738,-2337 738,-2312 455,-2312"/>
-<text text-anchor="start" x="460" y="-2321.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_type</text>
-<text text-anchor="start" x="522" y="-2321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="527" y="-2321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
-<text text-anchor="start" x="639" y="-2321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="455,-2287 455,-2312 738,-2312 738,-2287 455,-2287"/>
-<text text-anchor="start" x="460" y="-2296.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
-<text text-anchor="start" x="530" y="-2296.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="535" y="-2296.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="455,-2262 455,-2287 738,-2287 738,-2262 455,-2262"/>
-<text text-anchor="start" x="460" y="-2271.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
-<text text-anchor="start" x="495" y="-2271.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="500" y="-2271.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
-<polygon fill="none" stroke="black" points="455,-2237 455,-2262 738,-2262 738,-2237 455,-2237"/>
-<text text-anchor="start" x="460" y="-2246.8" font-family="Helvetica,sans-Serif" font-size="14.00">triggered_by</text>
-<text text-anchor="start" x="548" y="-2246.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="553" y="-2246.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
-<polygon fill="none" stroke="black" points="455,-2212 455,-2237 738,-2237 738,-2212 455,-2212"/>
-<text text-anchor="start" x="460" y="-2221.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="539" y="-2221.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="544" y="-2221.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-3200 455,-3228 738,-3228 738,-3200 455,-3200"/>
+<text text-anchor="start" x="560" y="-3211.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_run</text>
+<polygon fill="none" stroke="black" points="455,-3175 455,-3200 738,-3200 738,-3175 455,-3175"/>
+<text text-anchor="start" x="460" y="-3184.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="473" y="-3184.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="478" y="-3184.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="555" y="-3184.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-3150 455,-3175 738,-3175 738,-3150 455,-3150"/>
+<text text-anchor="start" x="460" y="-3159.8" font-family="Helvetica,sans-Serif" font-size="14.00">backfill_id</text>
+<text text-anchor="start" x="530" y="-3159.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="535" y="-3159.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="455,-3125 455,-3150 738,-3150 738,-3125 455,-3125"/>
+<text text-anchor="start" x="460" y="-3134.8" font-family="Helvetica,sans-Serif" font-size="14.00">clear_number</text>
+<text text-anchor="start" x="556" y="-3134.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="561" y="-3134.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="638" y="-3134.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-3100 455,-3125 738,-3125 738,-3100 455,-3100"/>
+<text text-anchor="start" x="460" y="-3109.8" font-family="Helvetica,sans-Serif" font-size="14.00">conf</text>
+<text text-anchor="start" x="491" y="-3109.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="496" y="-3109.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
+<polygon fill="none" stroke="black" points="455,-3075 455,-3100 738,-3100 738,-3075 455,-3075"/>
+<text text-anchor="start" x="460" y="-3084.8" font-family="Helvetica,sans-Serif" font-size="14.00">creating_job_id</text>
+<text text-anchor="start" x="564" y="-3084.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="569" y="-3084.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="455,-3050 455,-3075 738,-3075 738,-3050 455,-3050"/>
+<text text-anchor="start" x="460" y="-3059.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_hash</text>
+<text text-anchor="start" x="527" y="-3059.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="532" y="-3059.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
+<polygon fill="none" stroke="black" points="455,-3025 455,-3050 738,-3050 738,-3025 455,-3025"/>
+<text text-anchor="start" x="460" y="-3034.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="506" y="-3034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="511" y="-3034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="632" y="-3034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-3000 455,-3025 738,-3025 738,-3000 455,-3000"/>
+<text text-anchor="start" x="460" y="-3009.8" font-family="Helvetica,sans-Serif" font-size="14.00">data_interval_end</text>
+<text text-anchor="start" x="584" y="-3009.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="589" y="-3009.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2975 455,-3000 738,-3000 738,-2975 455,-2975"/>
+<text text-anchor="start" x="460" y="-2984.8" font-family="Helvetica,sans-Serif" font-size="14.00">data_interval_start</text>
+<text text-anchor="start" x="590" y="-2984.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="595" y="-2984.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2950 455,-2975 738,-2975 738,-2950 455,-2950"/>
+<text text-anchor="start" x="460" y="-2959.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
+<text text-anchor="start" x="524" y="-2959.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="529" y="-2959.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2925 455,-2950 738,-2950 738,-2925 455,-2925"/>
+<text text-anchor="start" x="460" y="-2934.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_trigger</text>
+<text text-anchor="start" x="571" y="-2934.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="576" y="-2934.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="455,-2900 455,-2925 738,-2925 738,-2900 455,-2900"/>
+<text text-anchor="start" x="460" y="-2909.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_scheduling_decision</text>
+<text text-anchor="start" x="632" y="-2909.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="637" y="-2909.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2875 455,-2900 738,-2900 738,-2875 455,-2875"/>
+<text text-anchor="start" x="460" y="-2884.8" font-family="Helvetica,sans-Serif" font-size="14.00">log_template_id</text>
+<text text-anchor="start" x="569" y="-2884.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="574" y="-2884.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="455,-2850 455,-2875 738,-2875 738,-2850 455,-2850"/>
+<text text-anchor="start" x="460" y="-2859.8" font-family="Helvetica,sans-Serif" font-size="14.00">logical_date</text>
+<text text-anchor="start" x="542" y="-2859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="547" y="-2859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="643" y="-2859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-2825 455,-2850 738,-2850 738,-2825 455,-2825"/>
+<text text-anchor="start" x="460" y="-2834.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_at</text>
+<text text-anchor="start" x="533" y="-2834.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="538" y="-2834.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2800 455,-2825 738,-2825 738,-2800 455,-2800"/>
+<text text-anchor="start" x="460" y="-2809.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
+<text text-anchor="start" x="504" y="-2809.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="509" y="-2809.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="630" y="-2809.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-2775 455,-2800 738,-2800 738,-2775 455,-2775"/>
+<text text-anchor="start" x="460" y="-2784.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_type</text>
+<text text-anchor="start" x="522" y="-2784.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="527" y="-2784.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
+<text text-anchor="start" x="639" y="-2784.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="455,-2750 455,-2775 738,-2775 738,-2750 455,-2750"/>
+<text text-anchor="start" x="460" y="-2759.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
+<text text-anchor="start" x="530" y="-2759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="535" y="-2759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="455,-2725 455,-2750 738,-2750 738,-2725 455,-2725"/>
+<text text-anchor="start" x="460" y="-2734.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
+<text text-anchor="start" x="495" y="-2734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="500" y="-2734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
+<polygon fill="none" stroke="black" points="455,-2700 455,-2725 738,-2725 738,-2700 455,-2700"/>
+<text text-anchor="start" x="460" y="-2709.8" font-family="Helvetica,sans-Serif" font-size="14.00">triggered_by</text>
+<text text-anchor="start" x="548" y="-2709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="553" y="-2709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(50)]</text>
+<polygon fill="none" stroke="black" points="455,-2675 455,-2700 738,-2700 738,-2675 455,-2675"/>
+<text text-anchor="start" x="460" y="-2684.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="539" y="-2684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="544" y="-2684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
 </g>
 <!-- log_template&#45;&#45;dag_run -->
-<g id="edge23" class="edge">
+<g id="edge19" class="edge">
 <title>log_template&#45;&#45;dag_run</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M294.73,-2489C342.84,-2489 397.1,-2489 446.12,-2489"/>
-<text text-anchor="start" x="415.12" y="-2477.8" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="294.73" y="-2477.8" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M294.73,-2952C342.84,-2952 397.1,-2952 446.12,-2952"/>
+<text text-anchor="start" x="415.12" y="-2940.8" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="294.73" y="-2940.8" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
-<!-- dag_run&#45;&#45;dagrun_dataset_event -->
-<g id="edge24" class="edge">
-<title>dag_run&#45;&#45;dagrun_dataset_event</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.65,-2763.58C783.52,-2814.69 828.15,-2863.43 879,-2900 894.78,-2911.35 912.98,-2920.23 931.65,-2927.18"/>
-<text text-anchor="start" x="900.65" y="-2915.98" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.65" y="-2752.38" font-family="Times,serif" font-size="14.00">1</text>
+<!-- dag_run&#45;&#45;dagrun_asset_event -->
+<g id="edge20" class="edge">
+<title>dag_run&#45;&#45;dagrun_asset_event</title>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M692.69,-3232.63C729.38,-3305.7 778.25,-3378.33 842,-3430 865.04,-3448.67 893.69,-3461.25 922.36,-3469.72"/>
+<text text-anchor="start" x="891.36" y="-3458.52" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="682.69" y="-3236.43" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance -->
 <g id="node29" class="node">
 <title>task_instance</title>
-<polygon fill="none" stroke="black" points="908.5,-2405 908.5,-2433 1216.5,-2433 1216.5,-2405 908.5,-2405"/>
-<text text-anchor="start" x="1001" y="-2416.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance</text>
-<polygon fill="none" stroke="black" points="908.5,-2380 908.5,-2405 1216.5,-2405 1216.5,-2380 908.5,-2380"/>
-<text text-anchor="start" x="913.5" y="-2389.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="959.5" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="964.5" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1085.5" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-2355 908.5,-2380 1216.5,-2380 1216.5,-2355 908.5,-2355"/>
-<text text-anchor="start" x="913.5" y="-2364.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
-<text text-anchor="start" x="989.5" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="994.5" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1071.5" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-2330 908.5,-2355 1216.5,-2355 1216.5,-2330 908.5,-2330"/>
-<text text-anchor="start" x="913.5" y="-2339.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
-<text text-anchor="start" x="957.5" y="-2339.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="962.5" y="-2339.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1083.5" y="-2339.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-2305 908.5,-2330 1216.5,-2330 1216.5,-2305 908.5,-2305"/>
-<text text-anchor="start" x="913.5" y="-2314.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="962.5" y="-2314.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="967.5" y="-2314.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1088.5" y="-2314.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-2280 908.5,-2305 1216.5,-2305 1216.5,-2280 908.5,-2280"/>
-<text text-anchor="start" x="913.5" y="-2289.8" font-family="Helvetica,sans-Serif" font-size="14.00">custom_operator_name</text>
-<text text-anchor="start" x="1076.5" y="-2289.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1081.5" y="-2289.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-2255 908.5,-2280 1216.5,-2280 1216.5,-2255 908.5,-2255"/>
-<text text-anchor="start" x="913.5" y="-2264.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
-<text text-anchor="start" x="972.5" y="-2264.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="977.5" y="-2264.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [DOUBLE_PRECISION]</text>
-<polygon fill="none" stroke="black" points="908.5,-2230 908.5,-2255 1216.5,-2255 1216.5,-2230 908.5,-2230"/>
-<text text-anchor="start" x="913.5" y="-2239.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
-<text text-anchor="start" x="977.5" y="-2239.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="982.5" y="-2239.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="908.5,-2205 908.5,-2230 1216.5,-2230 1216.5,-2205 908.5,-2205"/>
-<text text-anchor="start" x="913.5" y="-2214.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor</text>
-<text text-anchor="start" x="974.5" y="-2214.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="979.5" y="-2214.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-2180 908.5,-2205 1216.5,-2205 1216.5,-2180 908.5,-2180"/>
-<text text-anchor="start" x="913.5" y="-2189.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor_config</text>
-<text text-anchor="start" x="1023.5" y="-2189.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1028.5" y="-2189.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
-<polygon fill="none" stroke="black" points="908.5,-2155 908.5,-2180 1216.5,-2180 1216.5,-2155 908.5,-2155"/>
-<text text-anchor="start" x="913.5" y="-2164.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_executor_id</text>
-<text text-anchor="start" x="1056.5" y="-2164.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1061.5" y="-2164.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="908.5,-2130 908.5,-2155 1216.5,-2155 1216.5,-2130 908.5,-2130"/>
-<text text-anchor="start" x="913.5" y="-2139.8" font-family="Helvetica,sans-Serif" font-size="14.00">hostname</text>
-<text text-anchor="start" x="983.5" y="-2139.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="988.5" y="-2139.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-2105 908.5,-2130 1216.5,-2130 1216.5,-2105 908.5,-2105"/>
-<text text-anchor="start" x="913.5" y="-2114.8" font-family="Helvetica,sans-Serif" font-size="14.00">job_id</text>
-<text text-anchor="start" x="954.5" y="-2114.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="959.5" y="-2114.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-2080 908.5,-2105 1216.5,-2105 1216.5,-2080 908.5,-2080"/>
-<text text-anchor="start" x="913.5" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_tries</text>
-<text text-anchor="start" x="981.5" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="986.5" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-2055 908.5,-2080 1216.5,-2080 1216.5,-2055 908.5,-2055"/>
-<text text-anchor="start" x="913.5" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_kwargs</text>
-<text text-anchor="start" x="1001.5" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1006.5" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="908.5,-2030 908.5,-2055 1216.5,-2055 1216.5,-2030 908.5,-2030"/>
-<text text-anchor="start" x="913.5" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_method</text>
-<text text-anchor="start" x="1004.5" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1009.5" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-2005 908.5,-2030 1216.5,-2030 1216.5,-2005 908.5,-2005"/>
-<text text-anchor="start" x="913.5" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00">operator</text>
-<text text-anchor="start" x="973.5" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="978.5" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1980 908.5,-2005 1216.5,-2005 1216.5,-1980 908.5,-1980"/>
-<text text-anchor="start" x="913.5" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00">pid</text>
-<text text-anchor="start" x="935.5" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="940.5" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-1955 908.5,-1980 1216.5,-1980 1216.5,-1955 908.5,-1955"/>
-<text text-anchor="start" x="913.5" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool</text>
-<text text-anchor="start" x="943.5" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="948.5" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="1069.5" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-1930 908.5,-1955 1216.5,-1955 1216.5,-1930 908.5,-1930"/>
-<text text-anchor="start" x="913.5" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool_slots</text>
-<text text-anchor="start" x="982.5" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="987.5" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1064.5" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="908.5,-1905 908.5,-1930 1216.5,-1930 1216.5,-1905 908.5,-1905"/>
-<text text-anchor="start" x="913.5" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00">priority_weight</text>
-<text text-anchor="start" x="1017.5" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1022.5" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-1880 908.5,-1905 1216.5,-1905 1216.5,-1880 908.5,-1880"/>
-<text text-anchor="start" x="913.5" y="-1889.8" font-family="Helvetica,sans-Serif" font-size="14.00">queue</text>
-<text text-anchor="start" x="957.5" y="-1889.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="962.5" y="-1889.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1855 908.5,-1880 1216.5,-1880 1216.5,-1855 908.5,-1855"/>
-<text text-anchor="start" x="913.5" y="-1864.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_by_job_id</text>
-<text text-anchor="start" x="1037.5" y="-1864.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1042.5" y="-1864.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-1830 908.5,-1855 1216.5,-1855 1216.5,-1830 908.5,-1830"/>
-<text text-anchor="start" x="913.5" y="-1839.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_dttm</text>
-<text text-anchor="start" x="1006.5" y="-1839.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1011.5" y="-1839.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="908.5,-1805 908.5,-1830 1216.5,-1830 1216.5,-1805 908.5,-1805"/>
-<text text-anchor="start" x="913.5" y="-1814.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_map_index</text>
-<text text-anchor="start" x="1058.5" y="-1814.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1063.5" y="-1814.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1780 908.5,-1805 1216.5,-1805 1216.5,-1780 908.5,-1780"/>
-<text text-anchor="start" x="913.5" y="-1789.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
-<text text-anchor="start" x="983.5" y="-1789.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="988.5" y="-1789.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="908.5,-1755 908.5,-1780 1216.5,-1780 1216.5,-1755 908.5,-1755"/>
-<text text-anchor="start" x="913.5" y="-1764.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
-<text text-anchor="start" x="948.5" y="-1764.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="953.5" y="-1764.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(20)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1730 908.5,-1755 1216.5,-1755 1216.5,-1730 908.5,-1730"/>
-<text text-anchor="start" x="913.5" y="-1739.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_display_name</text>
-<text text-anchor="start" x="1045.5" y="-1739.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1050.5" y="-1739.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1705 908.5,-1730 1216.5,-1730 1216.5,-1705 908.5,-1705"/>
-<text text-anchor="start" x="913.5" y="-1714.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_id</text>
-<text text-anchor="start" x="980.5" y="-1714.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="985.5" y="-1714.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-1680 908.5,-1705 1216.5,-1705 1216.5,-1680 908.5,-1680"/>
-<text text-anchor="start" x="913.5" y="-1689.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_timeout</text>
-<text text-anchor="start" x="1021.5" y="-1689.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1026.5" y="-1689.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="908.5,-1655 908.5,-1680 1216.5,-1680 1216.5,-1655 908.5,-1655"/>
-<text text-anchor="start" x="913.5" y="-1664.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
-<text text-anchor="start" x="995.5" y="-1664.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1000.5" y="-1664.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="908.5,-1630 908.5,-1655 1216.5,-1655 1216.5,-1630 908.5,-1630"/>
-<text text-anchor="start" x="913.5" y="-1639.8" font-family="Helvetica,sans-Serif" font-size="14.00">unixname</text>
-<text text-anchor="start" x="983.5" y="-1639.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="988.5" y="-1639.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="908.5,-1605 908.5,-1630 1216.5,-1630 1216.5,-1605 908.5,-1605"/>
-<text text-anchor="start" x="913.5" y="-1614.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="992.5" y="-1614.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="997.5" y="-1614.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="899,-3338 899,-3366 1207,-3366 1207,-3338 899,-3338"/>
+<text text-anchor="start" x="991.5" y="-3349.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance</text>
+<polygon fill="none" stroke="black" points="899,-3313 899,-3338 1207,-3338 1207,-3313 899,-3313"/>
+<text text-anchor="start" x="904" y="-3322.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="950" y="-3322.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="955" y="-3322.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1076" y="-3322.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-3288 899,-3313 1207,-3313 1207,-3288 899,-3288"/>
+<text text-anchor="start" x="904" y="-3297.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
+<text text-anchor="start" x="980" y="-3297.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="985" y="-3297.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1062" y="-3297.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-3263 899,-3288 1207,-3288 1207,-3263 899,-3263"/>
+<text text-anchor="start" x="904" y="-3272.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
+<text text-anchor="start" x="948" y="-3272.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="953" y="-3272.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1074" y="-3272.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-3238 899,-3263 1207,-3263 1207,-3238 899,-3238"/>
+<text text-anchor="start" x="904" y="-3247.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="953" y="-3247.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="958" y="-3247.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1079" y="-3247.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-3213 899,-3238 1207,-3238 1207,-3213 899,-3213"/>
+<text text-anchor="start" x="904" y="-3222.8" font-family="Helvetica,sans-Serif" font-size="14.00">custom_operator_name</text>
+<text text-anchor="start" x="1067" y="-3222.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1072" y="-3222.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-3188 899,-3213 1207,-3213 1207,-3188 899,-3188"/>
+<text text-anchor="start" x="904" y="-3197.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
+<text text-anchor="start" x="963" y="-3197.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="968" y="-3197.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [DOUBLE_PRECISION]</text>
+<polygon fill="none" stroke="black" points="899,-3163 899,-3188 1207,-3188 1207,-3163 899,-3163"/>
+<text text-anchor="start" x="904" y="-3172.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
+<text text-anchor="start" x="968" y="-3172.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="973" y="-3172.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="899,-3138 899,-3163 1207,-3163 1207,-3138 899,-3138"/>
+<text text-anchor="start" x="904" y="-3147.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor</text>
+<text text-anchor="start" x="965" y="-3147.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="970" y="-3147.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-3113 899,-3138 1207,-3138 1207,-3113 899,-3113"/>
+<text text-anchor="start" x="904" y="-3122.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor_config</text>
+<text text-anchor="start" x="1014" y="-3122.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1019" y="-3122.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
+<polygon fill="none" stroke="black" points="899,-3088 899,-3113 1207,-3113 1207,-3088 899,-3088"/>
+<text text-anchor="start" x="904" y="-3097.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_executor_id</text>
+<text text-anchor="start" x="1047" y="-3097.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1052" y="-3097.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="899,-3063 899,-3088 1207,-3088 1207,-3063 899,-3063"/>
+<text text-anchor="start" x="904" y="-3072.8" font-family="Helvetica,sans-Serif" font-size="14.00">hostname</text>
+<text text-anchor="start" x="974" y="-3072.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="979" y="-3072.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-3038 899,-3063 1207,-3063 1207,-3038 899,-3038"/>
+<text text-anchor="start" x="904" y="-3047.8" font-family="Helvetica,sans-Serif" font-size="14.00">job_id</text>
+<text text-anchor="start" x="945" y="-3047.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="950" y="-3047.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-3013 899,-3038 1207,-3038 1207,-3013 899,-3013"/>
+<text text-anchor="start" x="904" y="-3022.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_tries</text>
+<text text-anchor="start" x="972" y="-3022.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="977" y="-3022.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2988 899,-3013 1207,-3013 1207,-2988 899,-2988"/>
+<text text-anchor="start" x="904" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_kwargs</text>
+<text text-anchor="start" x="992" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="997" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="899,-2963 899,-2988 1207,-2988 1207,-2963 899,-2963"/>
+<text text-anchor="start" x="904" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_method</text>
+<text text-anchor="start" x="995" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1000" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-2938 899,-2963 1207,-2963 1207,-2938 899,-2938"/>
+<text text-anchor="start" x="904" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00">operator</text>
+<text text-anchor="start" x="964" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="969" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-2913 899,-2938 1207,-2938 1207,-2913 899,-2913"/>
+<text text-anchor="start" x="904" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00">pid</text>
+<text text-anchor="start" x="926" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="931" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2888 899,-2913 1207,-2913 1207,-2888 899,-2888"/>
+<text text-anchor="start" x="904" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool</text>
+<text text-anchor="start" x="934" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="939" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="1060" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-2863 899,-2888 1207,-2888 1207,-2863 899,-2863"/>
+<text text-anchor="start" x="904" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool_slots</text>
+<text text-anchor="start" x="973" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="978" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1055" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="899,-2838 899,-2863 1207,-2863 1207,-2838 899,-2838"/>
+<text text-anchor="start" x="904" y="-2847.8" font-family="Helvetica,sans-Serif" font-size="14.00">priority_weight</text>
+<text text-anchor="start" x="1008" y="-2847.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1013" y="-2847.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2813 899,-2838 1207,-2838 1207,-2813 899,-2813"/>
+<text text-anchor="start" x="904" y="-2822.8" font-family="Helvetica,sans-Serif" font-size="14.00">queue</text>
+<text text-anchor="start" x="948" y="-2822.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="953" y="-2822.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<polygon fill="none" stroke="black" points="899,-2788 899,-2813 1207,-2813 1207,-2788 899,-2788"/>
+<text text-anchor="start" x="904" y="-2797.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_by_job_id</text>
+<text text-anchor="start" x="1028" y="-2797.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1033" y="-2797.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2763 899,-2788 1207,-2788 1207,-2763 899,-2763"/>
+<text text-anchor="start" x="904" y="-2772.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_dttm</text>
+<text text-anchor="start" x="997" y="-2772.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1002" y="-2772.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="899,-2738 899,-2763 1207,-2763 1207,-2738 899,-2738"/>
+<text text-anchor="start" x="904" y="-2747.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_map_index</text>
+<text text-anchor="start" x="1049" y="-2747.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1054" y="-2747.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="899,-2713 899,-2738 1207,-2738 1207,-2713 899,-2713"/>
+<text text-anchor="start" x="904" y="-2722.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
+<text text-anchor="start" x="974" y="-2722.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="979" y="-2722.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="899,-2688 899,-2713 1207,-2713 1207,-2688 899,-2688"/>
+<text text-anchor="start" x="904" y="-2697.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
+<text text-anchor="start" x="939" y="-2697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="944" y="-2697.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(20)]</text>
+<polygon fill="none" stroke="black" points="899,-2663 899,-2688 1207,-2688 1207,-2663 899,-2663"/>
+<text text-anchor="start" x="904" y="-2672.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_display_name</text>
+<text text-anchor="start" x="1036" y="-2672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1041" y="-2672.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="899,-2638 899,-2663 1207,-2663 1207,-2638 899,-2638"/>
+<text text-anchor="start" x="904" y="-2647.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_id</text>
+<text text-anchor="start" x="971" y="-2647.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="976" y="-2647.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2613 899,-2638 1207,-2638 1207,-2613 899,-2613"/>
+<text text-anchor="start" x="904" y="-2622.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_timeout</text>
+<text text-anchor="start" x="1012" y="-2622.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1017" y="-2622.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="899,-2588 899,-2613 1207,-2613 1207,-2588 899,-2588"/>
+<text text-anchor="start" x="904" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
+<text text-anchor="start" x="986" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="991" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="899,-2563 899,-2588 1207,-2588 1207,-2563 899,-2563"/>
+<text text-anchor="start" x="904" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00">unixname</text>
+<text text-anchor="start" x="974" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="979" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="899,-2538 899,-2563 1207,-2563 1207,-2538 899,-2538"/>
+<text text-anchor="start" x="904" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="983" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="988" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
 </g>
 <!-- dag_run&#45;&#45;task_instance -->
-<g id="edge25" class="edge">
+<g id="edge21" class="edge">
 <title>dag_run&#45;&#45;task_instance</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.57,-2332.33C794.94,-2281.87 850.13,-2225.99 900.4,-2175.54"/>
-<text text-anchor="start" x="869.4" y="-2164.34" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.57" y="-2321.13" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.67,-2945.62C792.08,-2945.17 843.48,-2945.13 890.71,-2945.51"/>
+<text text-anchor="start" x="859.71" y="-2934.31" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="745.67" y="-2934.42" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag_run&#45;&#45;task_instance -->
-<g id="edge26" class="edge">
+<g id="edge22" class="edge">
 <title>dag_run&#45;&#45;task_instance</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.57,-2345.02C794.94,-2295.56 850.13,-2239.75 900.4,-2188.46"/>
-<text text-anchor="start" x="869.4" y="-2192.26" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.57" y="-2348.82" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.67,-2958.38C792.08,-2958.83 843.48,-2958.87 890.71,-2958.49"/>
+<text text-anchor="start" x="859.71" y="-2962.29" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="745.67" y="-2962.18" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- backfill_dag_run -->
 <g id="node30" class="node">
 <title>backfill_dag_run</title>
-<polygon fill="none" stroke="black" points="928.5,-2859 928.5,-2887 1197.5,-2887 1197.5,-2859 928.5,-2859"/>
-<text text-anchor="start" x="990.5" y="-2870.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">backfill_dag_run</text>
-<polygon fill="none" stroke="black" points="928.5,-2834 928.5,-2859 1197.5,-2859 1197.5,-2834 928.5,-2834"/>
-<text text-anchor="start" x="933.5" y="-2843.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="946.5" y="-2843.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="951.5" y="-2843.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1028.5" y="-2843.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="928.5,-2809 928.5,-2834 1197.5,-2834 1197.5,-2809 928.5,-2809"/>
-<text text-anchor="start" x="933.5" y="-2818.8" font-family="Helvetica,sans-Serif" font-size="14.00">backfill_id</text>
-<text text-anchor="start" x="1003.5" y="-2818.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1008.5" y="-2818.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1085.5" y="-2818.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="928.5,-2784 928.5,-2809 1197.5,-2809 1197.5,-2784 928.5,-2784"/>
-<text text-anchor="start" x="933.5" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_run_id</text>
-<text text-anchor="start" x="1010.5" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1015.5" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="928.5,-2759 928.5,-2784 1197.5,-2784 1197.5,-2759 928.5,-2759"/>
-<text text-anchor="start" x="933.5" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00">exception_reason</text>
-<text text-anchor="start" x="1054.5" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1059.5" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="928.5,-2734 928.5,-2759 1197.5,-2759 1197.5,-2734 928.5,-2734"/>
-<text text-anchor="start" x="933.5" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00">logical_date</text>
-<text text-anchor="start" x="1015.5" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1020.5" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1116.5" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="928.5,-2709 928.5,-2734 1197.5,-2734 1197.5,-2709 928.5,-2709"/>
-<text text-anchor="start" x="933.5" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00">sort_ordinal</text>
-<text text-anchor="start" x="1015.5" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1020.5" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1097.5" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="919,-2484 919,-2512 1188,-2512 1188,-2484 919,-2484"/>
+<text text-anchor="start" x="981" y="-2495.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">backfill_dag_run</text>
+<polygon fill="none" stroke="black" points="919,-2459 919,-2484 1188,-2484 1188,-2459 919,-2459"/>
+<text text-anchor="start" x="924" y="-2468.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="937" y="-2468.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="942" y="-2468.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1019" y="-2468.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="919,-2434 919,-2459 1188,-2459 1188,-2434 919,-2434"/>
+<text text-anchor="start" x="924" y="-2443.8" font-family="Helvetica,sans-Serif" font-size="14.00">backfill_id</text>
+<text text-anchor="start" x="994" y="-2443.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="999" y="-2443.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1076" y="-2443.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="919,-2409 919,-2434 1188,-2434 1188,-2409 919,-2409"/>
+<text text-anchor="start" x="924" y="-2418.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_run_id</text>
+<text text-anchor="start" x="1001" y="-2418.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1006" y="-2418.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="919,-2384 919,-2409 1188,-2409 1188,-2384 919,-2384"/>
+<text text-anchor="start" x="924" y="-2393.8" font-family="Helvetica,sans-Serif" font-size="14.00">exception_reason</text>
+<text text-anchor="start" x="1045" y="-2393.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1050" y="-2393.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="919,-2359 919,-2384 1188,-2384 1188,-2359 919,-2359"/>
+<text text-anchor="start" x="924" y="-2368.8" font-family="Helvetica,sans-Serif" font-size="14.00">logical_date</text>
+<text text-anchor="start" x="1006" y="-2368.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1011" y="-2368.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1107" y="-2368.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="919,-2334 919,-2359 1188,-2359 1188,-2334 919,-2334"/>
+<text text-anchor="start" x="924" y="-2343.8" font-family="Helvetica,sans-Serif" font-size="14.00">sort_ordinal</text>
+<text text-anchor="start" x="1006" y="-2343.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1011" y="-2343.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1088" y="-2343.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag_run&#45;&#45;backfill_dag_run -->
-<g id="edge27" class="edge">
+<g id="edge23" class="edge">
 <title>dag_run&#45;&#45;backfill_dag_run</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.82,-2602.71C788.16,-2633.68 834.79,-2666.51 879,-2695 892,-2703.37 905.71,-2711.81 919.54,-2720.05"/>
-<text text-anchor="start" x="888.54" y="-2708.85" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.82" y="-2591.51" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.63,-2753.16C766.56,-2723.06 787.3,-2692.03 806,-2662 842.47,-2603.44 831.28,-2574.83 879,-2525 888.41,-2515.18 898.96,-2505.98 910.1,-2497.45"/>
+<text text-anchor="start" x="879.1" y="-2486.25" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="745.63" y="-2741.96" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- dag_run_note -->
 <g id="node31" class="node">
 <title>dag_run_note</title>
-<polygon fill="none" stroke="black" points="929.5,-2654 929.5,-2682 1195.5,-2682 1195.5,-2654 929.5,-2654"/>
-<text text-anchor="start" x="1002" y="-2665.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_run_note</text>
-<polygon fill="none" stroke="black" points="929.5,-2629 929.5,-2654 1195.5,-2654 1195.5,-2629 929.5,-2629"/>
-<text text-anchor="start" x="934.5" y="-2638.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
-<text text-anchor="start" x="1011.5" y="-2638.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1016.5" y="-2638.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1093.5" y="-2638.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="929.5,-2604 929.5,-2629 1195.5,-2629 1195.5,-2604 929.5,-2604"/>
-<text text-anchor="start" x="934.5" y="-2613.8" font-family="Helvetica,sans-Serif" font-size="14.00">content</text>
-<text text-anchor="start" x="987.5" y="-2613.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="992.5" y="-2613.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="929.5,-2579 929.5,-2604 1195.5,-2604 1195.5,-2579 929.5,-2579"/>
-<text text-anchor="start" x="934.5" y="-2588.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="1007.5" y="-2588.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1012.5" y="-2588.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1108.5" y="-2588.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="929.5,-2554 929.5,-2579 1195.5,-2579 1195.5,-2554 929.5,-2554"/>
-<text text-anchor="start" x="934.5" y="-2563.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="1013.5" y="-2563.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1018.5" y="-2563.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1114.5" y="-2563.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="929.5,-2529 929.5,-2554 1195.5,-2554 1195.5,-2529 929.5,-2529"/>
-<text text-anchor="start" x="934.5" y="-2538.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
-<text text-anchor="start" x="985.5" y="-2538.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="990.5" y="-2538.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(128)]</text>
+<polygon fill="none" stroke="black" points="920,-2279 920,-2307 1186,-2307 1186,-2279 920,-2279"/>
+<text text-anchor="start" x="992.5" y="-2290.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">dag_run_note</text>
+<polygon fill="none" stroke="black" points="920,-2254 920,-2279 1186,-2279 1186,-2254 920,-2254"/>
+<text text-anchor="start" x="925" y="-2263.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
+<text text-anchor="start" x="1002" y="-2263.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1007" y="-2263.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1084" y="-2263.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-2229 920,-2254 1186,-2254 1186,-2229 920,-2229"/>
+<text text-anchor="start" x="925" y="-2238.8" font-family="Helvetica,sans-Serif" font-size="14.00">content</text>
+<text text-anchor="start" x="978" y="-2238.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="983" y="-2238.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="920,-2204 920,-2229 1186,-2229 1186,-2204 920,-2204"/>
+<text text-anchor="start" x="925" y="-2213.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="998" y="-2213.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1003" y="-2213.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1099" y="-2213.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-2179 920,-2204 1186,-2204 1186,-2179 920,-2179"/>
+<text text-anchor="start" x="925" y="-2188.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="1004" y="-2188.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1009" y="-2188.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1105" y="-2188.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="920,-2154 920,-2179 1186,-2179 1186,-2154 920,-2154"/>
+<text text-anchor="start" x="925" y="-2163.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
+<text text-anchor="start" x="976" y="-2163.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="981" y="-2163.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(128)]</text>
 </g>
 <!-- dag_run&#45;&#45;dag_run_note -->
-<g id="edge28" class="edge">
+<g id="edge24" class="edge">
 <title>dag_run&#45;&#45;dag_run_note</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.57,-2526.42C801.84,-2540.6 865.68,-2556.68 921.17,-2570.65"/>
-<text text-anchor="start" x="911.17" y="-2559.45" font-family="Times,serif" font-size="14.00">1</text>
-<text text-anchor="start" x="745.57" y="-2515.22" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.63,-2769.37C768.44,-2735.15 789.76,-2698.59 806,-2662 868.87,-2520.33 785.08,-2444.29 879,-2321 888.23,-2308.88 899.56,-2298.24 911.97,-2288.94"/>
+<text text-anchor="start" x="901.97" y="-2277.74" font-family="Times,serif" font-size="14.00">1</text>
+<text text-anchor="start" x="745.63" y="-2758.17" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_reschedule -->
 <g id="node32" class="node">
 <title>task_reschedule</title>
-<polygon fill="none" stroke="black" points="1331,-2613 1331,-2641 1632,-2641 1632,-2613 1331,-2613"/>
-<text text-anchor="start" x="1409" y="-2624.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_reschedule</text>
-<polygon fill="none" stroke="black" points="1331,-2588 1331,-2613 1632,-2613 1632,-2588 1331,-2588"/>
-<text text-anchor="start" x="1336" y="-2597.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="1349" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1354" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1431" y="-2597.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2563 1331,-2588 1632,-2588 1632,-2563 1331,-2563"/>
-<text text-anchor="start" x="1336" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1382" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1387" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1508" y="-2572.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2538 1331,-2563 1632,-2563 1632,-2538 1331,-2538"/>
-<text text-anchor="start" x="1336" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
-<text text-anchor="start" x="1395" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1400" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1477" y="-2547.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2513 1331,-2538 1632,-2538 1632,-2513 1331,-2513"/>
-<text text-anchor="start" x="1336" y="-2522.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
-<text text-anchor="start" x="1400" y="-2522.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1405" y="-2522.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1501" y="-2522.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2488 1331,-2513 1632,-2513 1632,-2488 1331,-2488"/>
-<text text-anchor="start" x="1336" y="-2497.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1412" y="-2497.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1417" y="-2497.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1494" y="-2497.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2463 1331,-2488 1632,-2488 1632,-2463 1331,-2463"/>
-<text text-anchor="start" x="1336" y="-2472.8" font-family="Helvetica,sans-Serif" font-size="14.00">reschedule_date</text>
-<text text-anchor="start" x="1450" y="-2472.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1455" y="-2472.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1551" y="-2472.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2438 1331,-2463 1632,-2463 1632,-2438 1331,-2438"/>
-<text text-anchor="start" x="1336" y="-2447.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1380" y="-2447.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1385" y="-2447.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1506" y="-2447.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2413 1331,-2438 1632,-2438 1632,-2413 1331,-2413"/>
-<text text-anchor="start" x="1336" y="-2422.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
-<text text-anchor="start" x="1406" y="-2422.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1411" y="-2422.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1507" y="-2422.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2388 1331,-2413 1632,-2413 1632,-2388 1331,-2388"/>
-<text text-anchor="start" x="1336" y="-2397.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1385" y="-2397.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1390" y="-2397.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1511" y="-2397.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1331,-2363 1331,-2388 1632,-2388 1632,-2363 1331,-2363"/>
-<text text-anchor="start" x="1336" y="-2372.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
-<text text-anchor="start" x="1418" y="-2372.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1423" y="-2372.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1500" y="-2372.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3775 1312,-3803 1613,-3803 1613,-3775 1312,-3775"/>
+<text text-anchor="start" x="1390" y="-3786.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_reschedule</text>
+<polygon fill="none" stroke="black" points="1312,-3750 1312,-3775 1613,-3775 1613,-3750 1312,-3750"/>
+<text text-anchor="start" x="1317" y="-3759.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="1330" y="-3759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1335" y="-3759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1412" y="-3759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3725 1312,-3750 1613,-3750 1613,-3725 1312,-3725"/>
+<text text-anchor="start" x="1317" y="-3734.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1363" y="-3734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1368" y="-3734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1489" y="-3734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3700 1312,-3725 1613,-3725 1613,-3700 1312,-3700"/>
+<text text-anchor="start" x="1317" y="-3709.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
+<text text-anchor="start" x="1376" y="-3709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1381" y="-3709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1458" y="-3709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3675 1312,-3700 1613,-3700 1613,-3675 1312,-3675"/>
+<text text-anchor="start" x="1317" y="-3684.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
+<text text-anchor="start" x="1381" y="-3684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1386" y="-3684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1482" y="-3684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3650 1312,-3675 1613,-3675 1613,-3650 1312,-3650"/>
+<text text-anchor="start" x="1317" y="-3659.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1393" y="-3659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1398" y="-3659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1475" y="-3659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3625 1312,-3650 1613,-3650 1613,-3625 1312,-3625"/>
+<text text-anchor="start" x="1317" y="-3634.8" font-family="Helvetica,sans-Serif" font-size="14.00">reschedule_date</text>
+<text text-anchor="start" x="1431" y="-3634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1436" y="-3634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1532" y="-3634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3600 1312,-3625 1613,-3625 1613,-3600 1312,-3600"/>
+<text text-anchor="start" x="1317" y="-3609.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1361" y="-3609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1366" y="-3609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1487" y="-3609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3575 1312,-3600 1613,-3600 1613,-3575 1312,-3575"/>
+<text text-anchor="start" x="1317" y="-3584.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
+<text text-anchor="start" x="1387" y="-3584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1392" y="-3584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1488" y="-3584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3550 1312,-3575 1613,-3575 1613,-3550 1312,-3550"/>
+<text text-anchor="start" x="1317" y="-3559.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1366" y="-3559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1371" y="-3559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1492" y="-3559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1312,-3525 1312,-3550 1613,-3550 1613,-3525 1312,-3525"/>
+<text text-anchor="start" x="1317" y="-3534.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
+<text text-anchor="start" x="1399" y="-3534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1404" y="-3534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1481" y="-3534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- dag_run&#45;&#45;task_reschedule -->
-<g id="edge29" class="edge">
+<g id="edge25" class="edge">
 <title>dag_run&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.79,-2485.99C905.77,-2486.32 1159.08,-2490.01 1322.4,-2494.37"/>
-<text text-anchor="start" x="1291.4" y="-2483.17" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.79" y="-2474.79" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M740.36,-3232.74C778.65,-3285.5 824.8,-3335 879,-3370 1010.61,-3454.98 1088.47,-3352.85 1227,-3426 1268.7,-3448.02 1266.62,-3469.69 1300,-3503 1305.85,-3508.84 1311.85,-3514.77 1317.94,-3520.74"/>
+<text text-anchor="start" x="1286.94" y="-3509.54" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="730.36" y="-3236.54" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- dag_run&#45;&#45;task_reschedule -->
-<g id="edge30" class="edge">
+<g id="edge26" class="edge">
 <title>dag_run&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M745.79,-2496.39C905.77,-2500.77 1159.08,-2504.54 1322.4,-2504.99"/>
-<text text-anchor="start" x="1291.4" y="-2508.79" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="745.79" y="-2500.19" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M727.99,-3232.63C768.58,-3292.41 818.83,-3349.15 879,-3388 1010.61,-3472.98 1088.47,-3370.85 1227,-3444 1268.7,-3466.02 1266.62,-3487.69 1300,-3521 1301.09,-3522.09 1302.18,-3523.18 1303.28,-3524.27"/>
+<text text-anchor="start" x="1272.28" y="-3528.07" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="717.99" y="-3236.43" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_reschedule -->
-<g id="edge46" class="edge">
+<g id="edge42" class="edge">
 <title>task_instance&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.72,-2211.41C1255.03,-2249.17 1287.21,-2287.89 1319,-2323 1329.71,-2334.83 1341.17,-2346.81 1352.87,-2358.71"/>
-<text text-anchor="start" x="1352.87" y="-2347.51" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.72" y="-2200.21" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.11,-3240.26C1232.65,-3279 1249.4,-3318.61 1264,-3357 1285,-3412.24 1269.41,-3434.44 1300,-3485 1307.46,-3497.33 1316.19,-3509.31 1325.66,-3520.87"/>
+<text text-anchor="start" x="1325.66" y="-3509.67" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.11" y="-3244.06" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_reschedule -->
-<g id="edge47" class="edge">
+<g id="edge43" class="edge">
 <title>task_instance&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.72,-2229.11C1255.03,-2267.17 1287.21,-2305.89 1319,-2341 1324.29,-2346.84 1329.76,-2352.72 1335.36,-2358.6"/>
-<text text-anchor="start" x="1304.36" y="-2347.4" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.72" y="-2217.91" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.11,-3258.13C1232.65,-3297 1249.4,-3336.61 1264,-3375 1285,-3430.24 1269.41,-3452.44 1300,-3503 1303.68,-3509.08 1307.67,-3515.08 1311.91,-3520.98"/>
+<text text-anchor="start" x="1280.91" y="-3509.78" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.11" y="-3261.93" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_reschedule -->
-<g id="edge48" class="edge">
+<g id="edge44" class="edge">
 <title>task_instance&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.72,-2246.82C1255.03,-2285.17 1287.21,-2323.89 1319,-2359 1320.03,-2360.14 1321.07,-2361.28 1322.12,-2362.42"/>
-<text text-anchor="start" x="1291.12" y="-2366.22" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.72" y="-2235.62" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.11,-3276C1232.65,-3315 1249.4,-3354.61 1264,-3393 1285,-3448.24 1269.41,-3470.44 1300,-3521 1301.09,-3522.81 1302.22,-3524.61 1303.36,-3526.4"/>
+<text text-anchor="start" x="1272.36" y="-3530.2" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.11" y="-3279.8" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_reschedule -->
-<g id="edge49" class="edge">
+<g id="edge45" class="edge">
 <title>task_instance&#45;&#45;task_reschedule</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.72,-2264.52C1255.03,-2303.17 1287.21,-2341.89 1319,-2377 1320.03,-2378.14 1321.07,-2379.28 1322.12,-2380.42"/>
-<text text-anchor="start" x="1291.12" y="-2384.22" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.72" y="-2253.32" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.11,-3293.88C1232.65,-3333 1249.4,-3372.61 1264,-3411 1285,-3466.24 1269.41,-3488.44 1300,-3539 1301.09,-3540.81 1302.22,-3542.61 1303.36,-3544.4"/>
+<text text-anchor="start" x="1272.36" y="-3548.2" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.11" y="-3297.68" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- rendered_task_instance_fields -->
 <g id="node35" class="node">
 <title>rendered_task_instance_fields</title>
-<polygon fill="none" stroke="black" points="1341,-2309 1341,-2337 1621,-2337 1621,-2309 1341,-2309"/>
-<text text-anchor="start" x="1346" y="-2320.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">rendered_task_instance_fields</text>
-<polygon fill="none" stroke="black" points="1341,-2284 1341,-2309 1621,-2309 1621,-2284 1341,-2284"/>
-<text text-anchor="start" x="1346" y="-2293.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1392" y="-2293.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1397" y="-2293.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1518" y="-2293.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1341,-2259 1341,-2284 1621,-2284 1621,-2259 1341,-2259"/>
-<text text-anchor="start" x="1346" y="-2268.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1422" y="-2268.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1427" y="-2268.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1504" y="-2268.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1341,-2234 1341,-2259 1621,-2259 1621,-2234 1341,-2234"/>
-<text text-anchor="start" x="1346" y="-2243.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1390" y="-2243.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1395" y="-2243.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1516" y="-2243.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1341,-2209 1341,-2234 1621,-2234 1621,-2209 1341,-2209"/>
-<text text-anchor="start" x="1346" y="-2218.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1395" y="-2218.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1400" y="-2218.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1521" y="-2218.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1341,-2184 1341,-2209 1621,-2209 1621,-2184 1341,-2184"/>
-<text text-anchor="start" x="1346" y="-2193.8" font-family="Helvetica,sans-Serif" font-size="14.00">k8s_pod_yaml</text>
-<text text-anchor="start" x="1445" y="-2193.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1450" y="-2193.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="1341,-2159 1341,-2184 1621,-2184 1621,-2159 1341,-2159"/>
-<text text-anchor="start" x="1346" y="-2168.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_fields</text>
-<text text-anchor="start" x="1453" y="-2168.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1458" y="-2168.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<text text-anchor="start" x="1509" y="-2168.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1322,-3471 1322,-3499 1602,-3499 1602,-3471 1322,-3471"/>
+<text text-anchor="start" x="1327" y="-3482.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">rendered_task_instance_fields</text>
+<polygon fill="none" stroke="black" points="1322,-3446 1322,-3471 1602,-3471 1602,-3446 1322,-3446"/>
+<text text-anchor="start" x="1327" y="-3455.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1373" y="-3455.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1378" y="-3455.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1499" y="-3455.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1322,-3421 1322,-3446 1602,-3446 1602,-3421 1322,-3421"/>
+<text text-anchor="start" x="1327" y="-3430.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1403" y="-3430.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1408" y="-3430.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1485" y="-3430.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1322,-3396 1322,-3421 1602,-3421 1602,-3396 1322,-3396"/>
+<text text-anchor="start" x="1327" y="-3405.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1371" y="-3405.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1376" y="-3405.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1497" y="-3405.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1322,-3371 1322,-3396 1602,-3396 1602,-3371 1322,-3371"/>
+<text text-anchor="start" x="1327" y="-3380.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1376" y="-3380.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1381" y="-3380.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1502" y="-3380.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1322,-3346 1322,-3371 1602,-3371 1602,-3346 1322,-3346"/>
+<text text-anchor="start" x="1327" y="-3355.8" font-family="Helvetica,sans-Serif" font-size="14.00">k8s_pod_yaml</text>
+<text text-anchor="start" x="1426" y="-3355.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1431" y="-3355.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="1322,-3321 1322,-3346 1602,-3346 1602,-3321 1322,-3321"/>
+<text text-anchor="start" x="1327" y="-3330.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_fields</text>
+<text text-anchor="start" x="1434" y="-3330.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1439" y="-3330.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<text text-anchor="start" x="1490" y="-3330.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- task_instance&#45;&#45;rendered_task_instance_fields -->
-<g id="edge34" class="edge">
+<g id="edge30" class="edge">
 <title>task_instance&#45;&#45;rendered_task_instance_fields</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2087.76C1264.47,-2108.91 1306.87,-2132.45 1345.4,-2154.91"/>
-<text text-anchor="start" x="1314.4" y="-2143.71" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2076.56" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.36,-3185.63C1241.6,-3219.32 1270.07,-3252.24 1300,-3281 1313.24,-3293.72 1328.31,-3305.72 1343.79,-3316.99"/>
+<text text-anchor="start" x="1343.79" y="-3305.79" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.36" y="-3174.43" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;rendered_task_instance_fields -->
-<g id="edge35" class="edge">
+<g id="edge31" class="edge">
 <title>task_instance&#45;&#45;rendered_task_instance_fields</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2100.94C1260.13,-2120.28 1297.66,-2140.95 1332.68,-2160.52"/>
-<text text-anchor="start" x="1301.68" y="-2164.32" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2104.74" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.36,-3203.45C1241.6,-3237.32 1270.07,-3270.24 1300,-3299 1306.32,-3305.08 1313.06,-3310.99 1320.06,-3316.71"/>
+<text text-anchor="start" x="1289.06" y="-3305.51" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.36" y="-3192.25" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;rendered_task_instance_fields -->
-<g id="edge36" class="edge">
+<g id="edge32" class="edge">
 <title>task_instance&#45;&#45;rendered_task_instance_fields</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2114.13C1260.13,-2133.94 1297.66,-2154.55 1332.68,-2173.49"/>
-<text text-anchor="start" x="1301.68" y="-2177.29" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2117.93" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.36,-3221.27C1241.6,-3255.32 1270.07,-3288.24 1300,-3317 1304.41,-3321.24 1309.03,-3325.4 1313.8,-3329.47"/>
+<text text-anchor="start" x="1282.8" y="-3333.27" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.36" y="-3210.07" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;rendered_task_instance_fields -->
-<g id="edge37" class="edge">
+<g id="edge33" class="edge">
 <title>task_instance&#45;&#45;rendered_task_instance_fields</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2127.32C1260.13,-2147.61 1297.66,-2168.14 1332.68,-2186.46"/>
-<text text-anchor="start" x="1301.68" y="-2190.26" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2131.12" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.36,-3239.09C1241.6,-3273.32 1270.07,-3306.24 1300,-3335 1304.41,-3339.24 1309.03,-3343.4 1313.8,-3347.46"/>
+<text text-anchor="start" x="1282.8" y="-3351.26" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.36" y="-3227.89" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_fail -->
 <g id="node36" class="node">
 <title>task_fail</title>
-<polygon fill="none" stroke="black" points="1351,-2105 1351,-2133 1612,-2133 1612,-2105 1351,-2105"/>
-<text text-anchor="start" x="1444" y="-2116.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_fail</text>
-<polygon fill="none" stroke="black" points="1351,-2080 1351,-2105 1612,-2105 1612,-2080 1351,-2080"/>
-<text text-anchor="start" x="1356" y="-2089.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="1369" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1374" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1451" y="-2089.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-2055 1351,-2080 1612,-2080 1612,-2055 1351,-2055"/>
-<text text-anchor="start" x="1356" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1402" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1528" y="-2064.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-2030 1351,-2055 1612,-2055 1612,-2030 1351,-2030"/>
-<text text-anchor="start" x="1356" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
-<text text-anchor="start" x="1415" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1420" y="-2039.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1351,-2005 1351,-2030 1612,-2030 1612,-2005 1351,-2005"/>
-<text text-anchor="start" x="1356" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
-<text text-anchor="start" x="1420" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1425" y="-2014.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1351,-1980 1351,-2005 1612,-2005 1612,-1980 1351,-1980"/>
-<text text-anchor="start" x="1356" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1432" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1437" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1514" y="-1989.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1955 1351,-1980 1612,-1980 1612,-1955 1351,-1955"/>
-<text text-anchor="start" x="1356" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1400" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1405" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1526" y="-1964.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1930 1351,-1955 1612,-1955 1612,-1930 1351,-1930"/>
-<text text-anchor="start" x="1356" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
-<text text-anchor="start" x="1426" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1431" y="-1939.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1351,-1905 1351,-1930 1612,-1930 1612,-1905 1351,-1905"/>
-<text text-anchor="start" x="1356" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1405" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1410" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1531" y="-1914.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3267 1332,-3295 1593,-3295 1593,-3267 1332,-3267"/>
+<text text-anchor="start" x="1425" y="-3278.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_fail</text>
+<polygon fill="none" stroke="black" points="1332,-3242 1332,-3267 1593,-3267 1593,-3242 1332,-3242"/>
+<text text-anchor="start" x="1337" y="-3251.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="1350" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1355" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1432" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3217 1332,-3242 1593,-3242 1593,-3217 1332,-3217"/>
+<text text-anchor="start" x="1337" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1383" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1509" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3192 1332,-3217 1593,-3217 1593,-3192 1332,-3192"/>
+<text text-anchor="start" x="1337" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
+<text text-anchor="start" x="1396" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1401" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1332,-3167 1332,-3192 1593,-3192 1593,-3167 1332,-3167"/>
+<text text-anchor="start" x="1337" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
+<text text-anchor="start" x="1401" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1406" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1332,-3142 1332,-3167 1593,-3167 1593,-3142 1332,-3142"/>
+<text text-anchor="start" x="1337" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1413" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1418" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1495" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3117 1332,-3142 1593,-3142 1593,-3117 1332,-3117"/>
+<text text-anchor="start" x="1337" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1381" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1386" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1507" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3092 1332,-3117 1593,-3117 1593,-3092 1332,-3092"/>
+<text text-anchor="start" x="1337" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
+<text text-anchor="start" x="1407" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1412" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1332,-3067 1332,-3092 1593,-3092 1593,-3067 1332,-3067"/>
+<text text-anchor="start" x="1337" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1386" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1391" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1512" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- task_instance&#45;&#45;task_fail -->
-<g id="edge38" class="edge">
+<g id="edge34" class="edge">
 <title>task_instance&#45;&#45;task_fail</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-1999.22C1263.44,-1998.43 1304.68,-1998.63 1342.41,-1999.82"/>
-<text text-anchor="start" x="1311.41" y="-1988.62" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-1988.02" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-3022.82C1250.9,-3042.26 1288.48,-3063.59 1323.2,-3084.18"/>
+<text text-anchor="start" x="1292.2" y="-3072.98" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-3011.62" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_fail -->
-<g id="edge39" class="edge">
+<g id="edge35" class="edge">
 <title>task_instance&#45;&#45;task_fail</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2012.41C1263.44,-2012.14 1304.68,-2012.21 1342.41,-2012.61"/>
-<text text-anchor="start" x="1311.41" y="-2016.41" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2016.21" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-3036.05C1250.9,-3055.94 1288.48,-3077.15 1323.2,-3097.04"/>
+<text text-anchor="start" x="1292.2" y="-3100.84" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-3039.85" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_fail -->
-<g id="edge40" class="edge">
+<g id="edge36" class="edge">
 <title>task_instance&#45;&#45;task_fail</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2025.59C1263.44,-2025.86 1304.68,-2025.79 1342.41,-2025.39"/>
-<text text-anchor="start" x="1311.41" y="-2029.19" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2029.39" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-3049.29C1250.9,-3069.63 1288.48,-3090.71 1323.2,-3109.89"/>
+<text text-anchor="start" x="1292.2" y="-3113.69" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-3053.09" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_fail -->
-<g id="edge41" class="edge">
+<g id="edge37" class="edge">
 <title>task_instance&#45;&#45;task_fail</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2038.78C1263.44,-2039.57 1304.68,-2039.37 1342.41,-2038.18"/>
-<text text-anchor="start" x="1311.41" y="-2041.98" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2042.58" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-3062.53C1250.9,-3083.32 1288.48,-3104.27 1323.2,-3122.75"/>
+<text text-anchor="start" x="1292.2" y="-3126.55" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-3066.33" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_map -->
 <g id="node37" class="node">
 <title>task_map</title>
-<polygon fill="none" stroke="black" points="1351,-1851 1351,-1879 1612,-1879 1612,-1851 1351,-1851"/>
-<text text-anchor="start" x="1439" y="-1862.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_map</text>
-<polygon fill="none" stroke="black" points="1351,-1826 1351,-1851 1612,-1851 1612,-1826 1351,-1826"/>
-<text text-anchor="start" x="1356" y="-1835.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1402" y="-1835.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-1835.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1528" y="-1835.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1801 1351,-1826 1612,-1826 1612,-1801 1351,-1801"/>
-<text text-anchor="start" x="1356" y="-1810.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1432" y="-1810.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1437" y="-1810.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1514" y="-1810.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1776 1351,-1801 1612,-1801 1612,-1776 1351,-1776"/>
-<text text-anchor="start" x="1356" y="-1785.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1400" y="-1785.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1405" y="-1785.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1526" y="-1785.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1751 1351,-1776 1612,-1776 1612,-1751 1351,-1751"/>
-<text text-anchor="start" x="1356" y="-1760.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1405" y="-1760.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1410" y="-1760.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1531" y="-1760.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1351,-1726 1351,-1751 1612,-1751 1612,-1726 1351,-1726"/>
-<text text-anchor="start" x="1356" y="-1735.8" font-family="Helvetica,sans-Serif" font-size="14.00">keys</text>
-<text text-anchor="start" x="1388" y="-1735.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1393" y="-1735.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="1351,-1701 1351,-1726 1612,-1726 1612,-1701 1351,-1701"/>
-<text text-anchor="start" x="1356" y="-1710.8" font-family="Helvetica,sans-Serif" font-size="14.00">length</text>
-<text text-anchor="start" x="1401" y="-1710.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1406" y="-1710.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1483" y="-1710.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-3013 1332,-3041 1593,-3041 1593,-3013 1332,-3013"/>
+<text text-anchor="start" x="1420" y="-3024.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_map</text>
+<polygon fill="none" stroke="black" points="1332,-2988 1332,-3013 1593,-3013 1593,-2988 1332,-2988"/>
+<text text-anchor="start" x="1337" y="-2997.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1383" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1509" y="-2997.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-2963 1332,-2988 1593,-2988 1593,-2963 1332,-2963"/>
+<text text-anchor="start" x="1337" y="-2972.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1413" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1418" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1495" y="-2972.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-2938 1332,-2963 1593,-2963 1593,-2938 1332,-2938"/>
+<text text-anchor="start" x="1337" y="-2947.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1381" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1386" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1507" y="-2947.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-2913 1332,-2938 1593,-2938 1593,-2913 1332,-2913"/>
+<text text-anchor="start" x="1337" y="-2922.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1386" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1391" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1512" y="-2922.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1332,-2888 1332,-2913 1593,-2913 1593,-2888 1332,-2888"/>
+<text text-anchor="start" x="1337" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00">keys</text>
+<text text-anchor="start" x="1369" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1374" y="-2897.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="1332,-2863 1332,-2888 1593,-2888 1593,-2863 1332,-2863"/>
+<text text-anchor="start" x="1337" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00">length</text>
+<text text-anchor="start" x="1382" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1387" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1464" y="-2872.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- task_instance&#45;&#45;task_map -->
-<g id="edge42" class="edge">
+<g id="edge38" class="edge">
 <title>task_instance&#45;&#45;task_map</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-1910.68C1263.44,-1888.5 1304.68,-1866.03 1342.41,-1846.47"/>
-<text text-anchor="start" x="1311.41" y="-1835.27" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-1899.48" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2932.14C1250.9,-2931.47 1288.48,-2931.66 1323.2,-2932.72"/>
+<text text-anchor="start" x="1292.2" y="-2921.52" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2920.94" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_map -->
-<g id="edge43" class="edge">
+<g id="edge39" class="edge">
 <title>task_instance&#45;&#45;task_map</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-1923.87C1263.44,-1902.21 1304.68,-1879.6 1342.41,-1859.26"/>
-<text text-anchor="start" x="1311.41" y="-1863.06" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-1927.67" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2945.38C1250.9,-2945.16 1288.48,-2945.22 1323.2,-2945.57"/>
+<text text-anchor="start" x="1292.2" y="-2949.37" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2949.18" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_map -->
-<g id="edge44" class="edge">
+<g id="edge40" class="edge">
 <title>task_instance&#45;&#45;task_map</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-1937.06C1263.44,-1915.92 1304.68,-1893.18 1342.41,-1872.04"/>
-<text text-anchor="start" x="1311.41" y="-1875.84" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-1940.86" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2958.62C1250.9,-2958.84 1288.48,-2958.78 1323.2,-2958.43"/>
+<text text-anchor="start" x="1292.2" y="-2962.23" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2962.42" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_map -->
-<g id="edge45" class="edge">
+<g id="edge41" class="edge">
 <title>task_instance&#45;&#45;task_map</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-1950.24C1264.47,-1929.09 1306.87,-1905.55 1345.4,-1883.09"/>
-<text text-anchor="start" x="1345.4" y="-1886.89" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-1954.04" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2971.86C1250.9,-2972.53 1288.48,-2972.34 1323.2,-2971.28"/>
+<text text-anchor="start" x="1292.2" y="-2975.08" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2975.66" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- xcom -->
 <g id="node38" class="node">
 <title>xcom</title>
-<polygon fill="none" stroke="black" points="1350,-1647 1350,-1675 1612,-1675 1612,-1647 1350,-1647"/>
-<text text-anchor="start" x="1456.5" y="-1658.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">xcom</text>
-<polygon fill="none" stroke="black" points="1350,-1622 1350,-1647 1612,-1647 1612,-1622 1350,-1622"/>
-<text text-anchor="start" x="1355" y="-1631.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
-<text text-anchor="start" x="1432" y="-1631.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1437" y="-1631.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1514" y="-1631.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1597 1350,-1622 1612,-1622 1612,-1597 1350,-1597"/>
-<text text-anchor="start" x="1355" y="-1606.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">key</text>
-<text text-anchor="start" x="1380" y="-1606.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1385" y="-1606.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
-<text text-anchor="start" x="1506" y="-1606.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1572 1350,-1597 1612,-1597 1612,-1572 1350,-1572"/>
-<text text-anchor="start" x="1355" y="-1581.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1431" y="-1581.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1436" y="-1581.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1513" y="-1581.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1547 1350,-1572 1612,-1572 1612,-1547 1350,-1547"/>
-<text text-anchor="start" x="1355" y="-1556.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1404" y="-1556.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1409" y="-1556.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1530" y="-1556.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1522 1350,-1547 1612,-1547 1612,-1522 1350,-1522"/>
-<text text-anchor="start" x="1355" y="-1531.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1401" y="-1531.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1406" y="-1531.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1527" y="-1531.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1497 1350,-1522 1612,-1522 1612,-1497 1350,-1497"/>
-<text text-anchor="start" x="1355" y="-1506.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1399" y="-1506.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1404" y="-1506.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1525" y="-1506.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1472 1350,-1497 1612,-1497 1612,-1472 1350,-1472"/>
-<text text-anchor="start" x="1355" y="-1481.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
-<text text-anchor="start" x="1430" y="-1481.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1435" y="-1481.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1531" y="-1481.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1350,-1447 1350,-1472 1612,-1472 1612,-1447 1350,-1447"/>
-<text text-anchor="start" x="1355" y="-1456.8" font-family="Helvetica,sans-Serif" font-size="14.00">value</text>
-<text text-anchor="start" x="1393" y="-1456.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1398" y="-1456.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
+<polygon fill="none" stroke="black" points="1331,-2809 1331,-2837 1593,-2837 1593,-2809 1331,-2809"/>
+<text text-anchor="start" x="1437.5" y="-2820.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">xcom</text>
+<polygon fill="none" stroke="black" points="1331,-2784 1331,-2809 1593,-2809 1593,-2784 1331,-2784"/>
+<text text-anchor="start" x="1336" y="-2793.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_run_id</text>
+<text text-anchor="start" x="1413" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1418" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1495" y="-2793.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2759 1331,-2784 1593,-2784 1593,-2759 1331,-2759"/>
+<text text-anchor="start" x="1336" y="-2768.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">key</text>
+<text text-anchor="start" x="1361" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1366" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
+<text text-anchor="start" x="1487" y="-2768.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2734 1331,-2759 1593,-2759 1593,-2734 1331,-2734"/>
+<text text-anchor="start" x="1336" y="-2743.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1412" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1417" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1494" y="-2743.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2709 1331,-2734 1593,-2734 1593,-2709 1331,-2709"/>
+<text text-anchor="start" x="1336" y="-2718.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1385" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1390" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1511" y="-2718.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2684 1331,-2709 1593,-2709 1593,-2684 1331,-2684"/>
+<text text-anchor="start" x="1336" y="-2693.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1382" y="-2693.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1387" y="-2693.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1508" y="-2693.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2659 1331,-2684 1593,-2684 1593,-2659 1331,-2659"/>
+<text text-anchor="start" x="1336" y="-2668.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1380" y="-2668.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1385" y="-2668.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1506" y="-2668.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2634 1331,-2659 1593,-2659 1593,-2634 1331,-2634"/>
+<text text-anchor="start" x="1336" y="-2643.8" font-family="Helvetica,sans-Serif" font-size="14.00">timestamp</text>
+<text text-anchor="start" x="1411" y="-2643.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1416" y="-2643.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1512" y="-2643.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1331,-2609 1331,-2634 1593,-2634 1593,-2609 1331,-2609"/>
+<text text-anchor="start" x="1336" y="-2618.8" font-family="Helvetica,sans-Serif" font-size="14.00">value</text>
+<text text-anchor="start" x="1374" y="-2618.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1379" y="-2618.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
 </g>
 <!-- task_instance&#45;&#45;xcom -->
-<g id="edge50" class="edge">
+<g id="edge46" class="edge">
 <title>task_instance&#45;&#45;xcom</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.64,-1767.99C1254.52,-1730.64 1286.58,-1693.77 1319,-1661 1326.26,-1653.66 1333.94,-1646.36 1341.86,-1639.21"/>
-<text text-anchor="start" x="1310.86" y="-1628.01" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.64" y="-1756.79" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2841.47C1250.79,-2820.75 1288.25,-2799.86 1322.88,-2781.43"/>
+<text text-anchor="start" x="1291.88" y="-2770.23" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2830.27" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;xcom -->
-<g id="edge51" class="edge">
+<g id="edge47" class="edge">
 <title>task_instance&#45;&#45;xcom</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.64,-1785.71C1254.52,-1748.64 1286.58,-1711.77 1319,-1679 1326.26,-1671.66 1333.94,-1664.36 1341.86,-1657.18"/>
-<text text-anchor="start" x="1310.86" y="-1645.98" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.64" y="-1774.51" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2854.71C1250.79,-2834.43 1288.25,-2813.42 1322.88,-2794.29"/>
+<text text-anchor="start" x="1291.88" y="-2798.09" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2858.51" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;xcom -->
-<g id="edge52" class="edge">
+<g id="edge48" class="edge">
 <title>task_instance&#45;&#45;xcom</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.64,-1803.44C1254.52,-1766.64 1286.58,-1729.77 1319,-1697 1326.26,-1689.66 1333.94,-1682.36 1341.86,-1675.16"/>
-<text text-anchor="start" x="1310.86" y="-1663.96" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.64" y="-1792.24" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2867.95C1250.79,-2848.12 1288.25,-2826.98 1322.88,-2807.15"/>
+<text text-anchor="start" x="1291.88" y="-2810.95" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2871.75" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;xcom -->
-<g id="edge53" class="edge">
+<g id="edge49" class="edge">
 <title>task_instance&#45;&#45;xcom</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.64,-1821.16C1254.52,-1784.64 1286.58,-1747.77 1319,-1715 1331.02,-1702.85 1344.19,-1690.8 1357.66,-1679.05"/>
-<text text-anchor="start" x="1326.66" y="-1682.85" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.64" y="-1809.96" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.15,-2881.18C1250.79,-2861.8 1288.25,-2840.54 1322.88,-2820.01"/>
+<text text-anchor="start" x="1291.88" y="-2823.81" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.15" y="-2884.98" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance_note -->
 <g id="node39" class="node">
 <title>task_instance_note</title>
-<polygon fill="none" stroke="black" points="1348,-1393 1348,-1421 1614,-1421 1614,-1393 1348,-1393"/>
-<text text-anchor="start" x="1395" y="-1404.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance_note</text>
-<polygon fill="none" stroke="black" points="1348,-1368 1348,-1393 1614,-1393 1614,-1368 1348,-1368"/>
-<text text-anchor="start" x="1353" y="-1377.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1399" y="-1377.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1404" y="-1377.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1525" y="-1377.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1343 1348,-1368 1614,-1368 1614,-1343 1348,-1343"/>
-<text text-anchor="start" x="1353" y="-1352.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1429" y="-1352.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1434" y="-1352.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1511" y="-1352.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1318 1348,-1343 1614,-1343 1614,-1318 1348,-1318"/>
-<text text-anchor="start" x="1353" y="-1327.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1397" y="-1327.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1402" y="-1327.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1523" y="-1327.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1293 1348,-1318 1614,-1318 1614,-1293 1348,-1293"/>
-<text text-anchor="start" x="1353" y="-1302.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1402" y="-1302.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-1302.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1528" y="-1302.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1268 1348,-1293 1614,-1293 1614,-1268 1348,-1268"/>
-<text text-anchor="start" x="1353" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="14.00">content</text>
-<text text-anchor="start" x="1406" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1411" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1348,-1243 1348,-1268 1614,-1268 1614,-1243 1348,-1243"/>
-<text text-anchor="start" x="1353" y="-1252.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="1426" y="-1252.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1431" y="-1252.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1527" y="-1252.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1218 1348,-1243 1614,-1243 1614,-1218 1348,-1218"/>
-<text text-anchor="start" x="1353" y="-1227.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="1432" y="-1227.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1437" y="-1227.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="1533" y="-1227.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1348,-1193 1348,-1218 1614,-1218 1614,-1193 1348,-1193"/>
-<text text-anchor="start" x="1353" y="-1202.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
-<text text-anchor="start" x="1404" y="-1202.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1409" y="-1202.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(128)]</text>
+<polygon fill="none" stroke="black" points="1329,-2555 1329,-2583 1595,-2583 1595,-2555 1329,-2555"/>
+<text text-anchor="start" x="1376" y="-2566.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance_note</text>
+<polygon fill="none" stroke="black" points="1329,-2530 1329,-2555 1595,-2555 1595,-2530 1329,-2530"/>
+<text text-anchor="start" x="1334" y="-2539.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1380" y="-2539.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1385" y="-2539.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1506" y="-2539.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2505 1329,-2530 1595,-2530 1595,-2505 1329,-2505"/>
+<text text-anchor="start" x="1334" y="-2514.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1410" y="-2514.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1415" y="-2514.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1492" y="-2514.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2480 1329,-2505 1595,-2505 1595,-2480 1329,-2480"/>
+<text text-anchor="start" x="1334" y="-2489.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1378" y="-2489.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1383" y="-2489.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1504" y="-2489.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2455 1329,-2480 1595,-2480 1595,-2455 1329,-2455"/>
+<text text-anchor="start" x="1334" y="-2464.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1383" y="-2464.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-2464.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1509" y="-2464.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2430 1329,-2455 1595,-2455 1595,-2430 1329,-2430"/>
+<text text-anchor="start" x="1334" y="-2439.8" font-family="Helvetica,sans-Serif" font-size="14.00">content</text>
+<text text-anchor="start" x="1387" y="-2439.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1392" y="-2439.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1329,-2405 1329,-2430 1595,-2430 1595,-2405 1329,-2405"/>
+<text text-anchor="start" x="1334" y="-2414.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="1407" y="-2414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1412" y="-2414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1508" y="-2414.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2380 1329,-2405 1595,-2405 1595,-2380 1329,-2380"/>
+<text text-anchor="start" x="1334" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="1413" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1418" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="1514" y="-2389.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1329,-2355 1329,-2380 1595,-2380 1595,-2355 1329,-2355"/>
+<text text-anchor="start" x="1334" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
+<text text-anchor="start" x="1385" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1390" y="-2364.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(128)]</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_note -->
-<g id="edge54" class="edge">
+<g id="edge50" class="edge">
 <title>task_instance&#45;&#45;task_instance_note</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1202.4,-1600.91C1235.24,-1532.59 1274.05,-1465.23 1319,-1407 1325.42,-1398.69 1332.49,-1390.6 1339.99,-1382.85"/>
-<text text-anchor="start" x="1308.99" y="-1371.65" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1192.4" y="-1589.71" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.02,-2671.93C1241.74,-2635.8 1270.44,-2600.5 1300,-2569 1306.58,-2561.99 1313.56,-2555.05 1320.79,-2548.27"/>
+<text text-anchor="start" x="1289.79" y="-2537.07" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.02" y="-2660.73" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_note -->
-<g id="edge55" class="edge">
+<g id="edge51" class="edge">
 <title>task_instance&#45;&#45;task_instance_note</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1211.07,-1600.94C1242.01,-1538.99 1277.95,-1478.19 1319,-1425 1325.42,-1416.69 1332.49,-1408.6 1339.99,-1400.82"/>
-<text text-anchor="start" x="1308.99" y="-1389.62" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1211.07" y="-1589.74" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.02,-2689.72C1241.74,-2653.8 1270.44,-2618.5 1300,-2587 1306.58,-2579.99 1313.56,-2573.05 1320.79,-2566.25"/>
+<text text-anchor="start" x="1289.79" y="-2555.05" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.02" y="-2678.52" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_note -->
-<g id="edge56" class="edge">
+<g id="edge52" class="edge">
 <title>task_instance&#45;&#45;task_instance_note</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1220.2,-1600.79C1249.02,-1545.28 1281.92,-1491.03 1319,-1443 1325.42,-1434.69 1332.49,-1426.6 1339.99,-1418.79"/>
-<text text-anchor="start" x="1308.99" y="-1407.59" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1220.2" y="-1589.59" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.02,-2707.52C1241.74,-2671.8 1270.44,-2636.5 1300,-2605 1306.58,-2597.99 1313.56,-2591.05 1320.79,-2584.23"/>
+<text text-anchor="start" x="1289.79" y="-2573.03" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.02" y="-2696.32" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_note -->
-<g id="edge57" class="edge">
+<g id="edge53" class="edge">
 <title>task_instance&#45;&#45;task_instance_note</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.58,-1610.29C1252.34,-1557.85 1283.79,-1506.62 1319,-1461 1328.57,-1448.6 1339.61,-1436.71 1351.32,-1425.39"/>
-<text text-anchor="start" x="1320.32" y="-1429.19" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.58" y="-1614.09" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.02,-2725.31C1241.74,-2689.8 1270.44,-2654.5 1300,-2623 1311.45,-2610.8 1324.13,-2598.8 1337.19,-2587.17"/>
+<text text-anchor="start" x="1306.19" y="-2590.97" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.02" y="-2714.11" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance_history -->
 <g id="node40" class="node">
 <title>task_instance_history</title>
-<polygon fill="none" stroke="black" points="1327,-3492 1327,-3520 1635,-3520 1635,-3492 1327,-3492"/>
-<text text-anchor="start" x="1383.5" y="-3503.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance_history</text>
-<polygon fill="none" stroke="black" points="1327,-3467 1327,-3492 1635,-3492 1635,-3467 1327,-3467"/>
-<text text-anchor="start" x="1332" y="-3476.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="1345" y="-3476.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1350" y="-3476.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1427" y="-3476.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-3442 1327,-3467 1635,-3467 1635,-3442 1327,-3442"/>
-<text text-anchor="start" x="1332" y="-3451.8" font-family="Helvetica,sans-Serif" font-size="14.00">custom_operator_name</text>
-<text text-anchor="start" x="1495" y="-3451.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1500" y="-3451.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-3417 1327,-3442 1635,-3442 1635,-3417 1327,-3417"/>
-<text text-anchor="start" x="1332" y="-3426.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="1378" y="-3426.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1383" y="-3426.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1504" y="-3426.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-3392 1327,-3417 1635,-3417 1635,-3392 1327,-3392"/>
-<text text-anchor="start" x="1332" y="-3401.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
-<text text-anchor="start" x="1391" y="-3401.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1396" y="-3401.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [DOUBLE_PRECISION]</text>
-<polygon fill="none" stroke="black" points="1327,-3367 1327,-3392 1635,-3392 1635,-3367 1327,-3367"/>
-<text text-anchor="start" x="1332" y="-3376.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
-<text text-anchor="start" x="1396" y="-3376.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1401" y="-3376.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1327,-3342 1327,-3367 1635,-3367 1635,-3342 1327,-3342"/>
-<text text-anchor="start" x="1332" y="-3351.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor</text>
-<text text-anchor="start" x="1393" y="-3351.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1398" y="-3351.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-3317 1327,-3342 1635,-3342 1635,-3317 1327,-3317"/>
-<text text-anchor="start" x="1332" y="-3326.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor_config</text>
-<text text-anchor="start" x="1442" y="-3326.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1447" y="-3326.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
-<polygon fill="none" stroke="black" points="1327,-3292 1327,-3317 1635,-3317 1635,-3292 1327,-3292"/>
-<text text-anchor="start" x="1332" y="-3301.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_executor_id</text>
-<text text-anchor="start" x="1475" y="-3301.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1480" y="-3301.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="1327,-3267 1327,-3292 1635,-3292 1635,-3267 1327,-3267"/>
-<text text-anchor="start" x="1332" y="-3276.8" font-family="Helvetica,sans-Serif" font-size="14.00">hostname</text>
-<text text-anchor="start" x="1402" y="-3276.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-3276.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-3242 1327,-3267 1635,-3267 1635,-3242 1327,-3242"/>
-<text text-anchor="start" x="1332" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00">job_id</text>
-<text text-anchor="start" x="1373" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1378" y="-3251.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-3217 1327,-3242 1635,-3242 1635,-3217 1327,-3217"/>
-<text text-anchor="start" x="1332" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
-<text text-anchor="start" x="1408" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1413" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1490" y="-3226.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-3192 1327,-3217 1635,-3217 1635,-3192 1327,-3192"/>
-<text text-anchor="start" x="1332" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_tries</text>
-<text text-anchor="start" x="1400" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1405" y="-3201.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-3167 1327,-3192 1635,-3192 1635,-3167 1327,-3167"/>
-<text text-anchor="start" x="1332" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_kwargs</text>
-<text text-anchor="start" x="1420" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1425" y="-3176.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="1327,-3142 1327,-3167 1635,-3167 1635,-3142 1327,-3142"/>
-<text text-anchor="start" x="1332" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_method</text>
-<text text-anchor="start" x="1423" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1428" y="-3151.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-3117 1327,-3142 1635,-3142 1635,-3117 1327,-3117"/>
-<text text-anchor="start" x="1332" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00">operator</text>
-<text text-anchor="start" x="1392" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1397" y="-3126.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-3092 1327,-3117 1635,-3117 1635,-3092 1327,-3092"/>
-<text text-anchor="start" x="1332" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00">pid</text>
-<text text-anchor="start" x="1354" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1359" y="-3101.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-3067 1327,-3092 1635,-3092 1635,-3067 1327,-3067"/>
-<text text-anchor="start" x="1332" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool</text>
-<text text-anchor="start" x="1362" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1367" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="1488" y="-3076.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-3042 1327,-3067 1635,-3067 1635,-3042 1327,-3042"/>
-<text text-anchor="start" x="1332" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool_slots</text>
-<text text-anchor="start" x="1401" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1406" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1483" y="-3051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-3017 1327,-3042 1635,-3042 1635,-3017 1327,-3017"/>
-<text text-anchor="start" x="1332" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00">priority_weight</text>
-<text text-anchor="start" x="1436" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1441" y="-3026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-2992 1327,-3017 1635,-3017 1635,-2992 1327,-2992"/>
-<text text-anchor="start" x="1332" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00">queue</text>
-<text text-anchor="start" x="1376" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1381" y="-3001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<polygon fill="none" stroke="black" points="1327,-2967 1327,-2992 1635,-2992 1635,-2967 1327,-2967"/>
-<text text-anchor="start" x="1332" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_by_job_id</text>
-<text text-anchor="start" x="1456" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1461" y="-2976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-2942 1327,-2967 1635,-2967 1635,-2942 1327,-2942"/>
-<text text-anchor="start" x="1332" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_dttm</text>
-<text text-anchor="start" x="1425" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1430" y="-2951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1327,-2917 1327,-2942 1635,-2942 1635,-2917 1327,-2917"/>
-<text text-anchor="start" x="1332" y="-2926.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_map_index</text>
-<text text-anchor="start" x="1477" y="-2926.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1482" y="-2926.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<polygon fill="none" stroke="black" points="1327,-2892 1327,-2917 1635,-2917 1635,-2892 1327,-2892"/>
-<text text-anchor="start" x="1332" y="-2901.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
-<text text-anchor="start" x="1376" y="-2901.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1381" y="-2901.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1502" y="-2901.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-2867 1327,-2892 1635,-2892 1635,-2867 1327,-2867"/>
-<text text-anchor="start" x="1332" y="-2876.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
-<text text-anchor="start" x="1402" y="-2876.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-2876.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1327,-2842 1327,-2867 1635,-2867 1635,-2842 1327,-2842"/>
-<text text-anchor="start" x="1332" y="-2851.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
-<text text-anchor="start" x="1367" y="-2851.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1372" y="-2851.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(20)]</text>
-<polygon fill="none" stroke="black" points="1327,-2817 1327,-2842 1635,-2842 1635,-2817 1327,-2817"/>
-<text text-anchor="start" x="1332" y="-2826.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_display_name</text>
-<text text-anchor="start" x="1464" y="-2826.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1469" y="-2826.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
-<polygon fill="none" stroke="black" points="1327,-2792 1327,-2817 1635,-2817 1635,-2792 1327,-2792"/>
-<text text-anchor="start" x="1332" y="-2801.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
-<text text-anchor="start" x="1381" y="-2801.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1386" y="-2801.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="1507" y="-2801.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-2767 1327,-2792 1635,-2792 1635,-2767 1327,-2767"/>
-<text text-anchor="start" x="1332" y="-2776.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_id</text>
-<text text-anchor="start" x="1399" y="-2776.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1404" y="-2776.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="1327,-2742 1327,-2767 1635,-2767 1635,-2742 1327,-2742"/>
-<text text-anchor="start" x="1332" y="-2751.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_timeout</text>
-<text text-anchor="start" x="1440" y="-2751.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1445" y="-2751.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="1327,-2717 1327,-2742 1635,-2742 1635,-2717 1327,-2717"/>
-<text text-anchor="start" x="1332" y="-2726.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
-<text text-anchor="start" x="1414" y="-2726.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1419" y="-2726.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1496" y="-2726.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="1327,-2692 1327,-2717 1635,-2717 1635,-2692 1327,-2692"/>
-<text text-anchor="start" x="1332" y="-2701.8" font-family="Helvetica,sans-Serif" font-size="14.00">unixname</text>
-<text text-anchor="start" x="1402" y="-2701.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1407" y="-2701.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<polygon fill="none" stroke="black" points="1327,-2667 1327,-2692 1635,-2692 1635,-2667 1327,-2667"/>
-<text text-anchor="start" x="1332" y="-2676.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="1411" y="-2676.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1416" y="-2676.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1308,-2300 1308,-2328 1616,-2328 1616,-2300 1308,-2300"/>
+<text text-anchor="start" x="1364.5" y="-2311.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">task_instance_history</text>
+<polygon fill="none" stroke="black" points="1308,-2275 1308,-2300 1616,-2300 1616,-2275 1308,-2275"/>
+<text text-anchor="start" x="1313" y="-2284.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="1326" y="-2284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1331" y="-2284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1408" y="-2284.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-2250 1308,-2275 1616,-2275 1616,-2250 1308,-2250"/>
+<text text-anchor="start" x="1313" y="-2259.8" font-family="Helvetica,sans-Serif" font-size="14.00">custom_operator_name</text>
+<text text-anchor="start" x="1476" y="-2259.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1481" y="-2259.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-2225 1308,-2250 1616,-2250 1616,-2225 1308,-2225"/>
+<text text-anchor="start" x="1313" y="-2234.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="1359" y="-2234.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1364" y="-2234.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1485" y="-2234.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-2200 1308,-2225 1616,-2225 1616,-2200 1308,-2200"/>
+<text text-anchor="start" x="1313" y="-2209.8" font-family="Helvetica,sans-Serif" font-size="14.00">duration</text>
+<text text-anchor="start" x="1372" y="-2209.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1377" y="-2209.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [DOUBLE_PRECISION]</text>
+<polygon fill="none" stroke="black" points="1308,-2175 1308,-2200 1616,-2200 1616,-2175 1308,-2175"/>
+<text text-anchor="start" x="1313" y="-2184.8" font-family="Helvetica,sans-Serif" font-size="14.00">end_date</text>
+<text text-anchor="start" x="1377" y="-2184.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1382" y="-2184.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1308,-2150 1308,-2175 1616,-2175 1616,-2150 1308,-2150"/>
+<text text-anchor="start" x="1313" y="-2159.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor</text>
+<text text-anchor="start" x="1374" y="-2159.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1379" y="-2159.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-2125 1308,-2150 1616,-2150 1616,-2125 1308,-2125"/>
+<text text-anchor="start" x="1313" y="-2134.8" font-family="Helvetica,sans-Serif" font-size="14.00">executor_config</text>
+<text text-anchor="start" x="1423" y="-2134.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1428" y="-2134.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
+<polygon fill="none" stroke="black" points="1308,-2100 1308,-2125 1616,-2125 1616,-2100 1308,-2100"/>
+<text text-anchor="start" x="1313" y="-2109.8" font-family="Helvetica,sans-Serif" font-size="14.00">external_executor_id</text>
+<text text-anchor="start" x="1456" y="-2109.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1461" y="-2109.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="1308,-2075 1308,-2100 1616,-2100 1616,-2075 1308,-2075"/>
+<text text-anchor="start" x="1313" y="-2084.8" font-family="Helvetica,sans-Serif" font-size="14.00">hostname</text>
+<text text-anchor="start" x="1383" y="-2084.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-2084.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-2050 1308,-2075 1616,-2075 1616,-2050 1308,-2050"/>
+<text text-anchor="start" x="1313" y="-2059.8" font-family="Helvetica,sans-Serif" font-size="14.00">job_id</text>
+<text text-anchor="start" x="1354" y="-2059.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1359" y="-2059.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-2025 1308,-2050 1616,-2050 1616,-2025 1308,-2025"/>
+<text text-anchor="start" x="1313" y="-2034.8" font-family="Helvetica,sans-Serif" font-size="14.00">map_index</text>
+<text text-anchor="start" x="1389" y="-2034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1394" y="-2034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1471" y="-2034.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-2000 1308,-2025 1616,-2025 1616,-2000 1308,-2000"/>
+<text text-anchor="start" x="1313" y="-2009.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_tries</text>
+<text text-anchor="start" x="1381" y="-2009.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1386" y="-2009.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-1975 1308,-2000 1616,-2000 1616,-1975 1308,-1975"/>
+<text text-anchor="start" x="1313" y="-1984.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_kwargs</text>
+<text text-anchor="start" x="1401" y="-1984.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1406" y="-1984.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="1308,-1950 1308,-1975 1616,-1975 1616,-1950 1308,-1950"/>
+<text text-anchor="start" x="1313" y="-1959.8" font-family="Helvetica,sans-Serif" font-size="14.00">next_method</text>
+<text text-anchor="start" x="1404" y="-1959.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1409" y="-1959.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-1925 1308,-1950 1616,-1950 1616,-1925 1308,-1925"/>
+<text text-anchor="start" x="1313" y="-1934.8" font-family="Helvetica,sans-Serif" font-size="14.00">operator</text>
+<text text-anchor="start" x="1373" y="-1934.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1378" y="-1934.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-1900 1308,-1925 1616,-1925 1616,-1900 1308,-1900"/>
+<text text-anchor="start" x="1313" y="-1909.8" font-family="Helvetica,sans-Serif" font-size="14.00">pid</text>
+<text text-anchor="start" x="1335" y="-1909.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1340" y="-1909.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-1875 1308,-1900 1616,-1900 1616,-1875 1308,-1875"/>
+<text text-anchor="start" x="1313" y="-1884.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool</text>
+<text text-anchor="start" x="1343" y="-1884.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1348" y="-1884.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="1469" y="-1884.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-1850 1308,-1875 1616,-1875 1616,-1850 1308,-1850"/>
+<text text-anchor="start" x="1313" y="-1859.8" font-family="Helvetica,sans-Serif" font-size="14.00">pool_slots</text>
+<text text-anchor="start" x="1382" y="-1859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1387" y="-1859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1464" y="-1859.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-1825 1308,-1850 1616,-1850 1616,-1825 1308,-1825"/>
+<text text-anchor="start" x="1313" y="-1834.8" font-family="Helvetica,sans-Serif" font-size="14.00">priority_weight</text>
+<text text-anchor="start" x="1417" y="-1834.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1422" y="-1834.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-1800 1308,-1825 1616,-1825 1616,-1800 1308,-1800"/>
+<text text-anchor="start" x="1313" y="-1809.8" font-family="Helvetica,sans-Serif" font-size="14.00">queue</text>
+<text text-anchor="start" x="1357" y="-1809.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1362" y="-1809.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<polygon fill="none" stroke="black" points="1308,-1775 1308,-1800 1616,-1800 1616,-1775 1308,-1775"/>
+<text text-anchor="start" x="1313" y="-1784.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_by_job_id</text>
+<text text-anchor="start" x="1437" y="-1784.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1442" y="-1784.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-1750 1308,-1775 1616,-1775 1616,-1750 1308,-1750"/>
+<text text-anchor="start" x="1313" y="-1759.8" font-family="Helvetica,sans-Serif" font-size="14.00">queued_dttm</text>
+<text text-anchor="start" x="1406" y="-1759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1411" y="-1759.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1308,-1725 1308,-1750 1616,-1750 1616,-1725 1308,-1725"/>
+<text text-anchor="start" x="1313" y="-1734.8" font-family="Helvetica,sans-Serif" font-size="14.00">rendered_map_index</text>
+<text text-anchor="start" x="1458" y="-1734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1463" y="-1734.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<polygon fill="none" stroke="black" points="1308,-1700 1308,-1725 1616,-1725 1616,-1700 1308,-1700"/>
+<text text-anchor="start" x="1313" y="-1709.8" font-family="Helvetica,sans-Serif" font-size="14.00">run_id</text>
+<text text-anchor="start" x="1357" y="-1709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1362" y="-1709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1483" y="-1709.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-1675 1308,-1700 1616,-1700 1616,-1675 1308,-1675"/>
+<text text-anchor="start" x="1313" y="-1684.8" font-family="Helvetica,sans-Serif" font-size="14.00">start_date</text>
+<text text-anchor="start" x="1383" y="-1684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-1684.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1308,-1650 1308,-1675 1616,-1675 1616,-1650 1308,-1650"/>
+<text text-anchor="start" x="1313" y="-1659.8" font-family="Helvetica,sans-Serif" font-size="14.00">state</text>
+<text text-anchor="start" x="1348" y="-1659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1353" y="-1659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(20)]</text>
+<polygon fill="none" stroke="black" points="1308,-1625 1308,-1650 1616,-1650 1616,-1625 1308,-1625"/>
+<text text-anchor="start" x="1313" y="-1634.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_display_name</text>
+<text text-anchor="start" x="1445" y="-1634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1450" y="-1634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(2000)]</text>
+<polygon fill="none" stroke="black" points="1308,-1600 1308,-1625 1616,-1625 1616,-1600 1308,-1600"/>
+<text text-anchor="start" x="1313" y="-1609.8" font-family="Helvetica,sans-Serif" font-size="14.00">task_id</text>
+<text text-anchor="start" x="1362" y="-1609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1367" y="-1609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="1488" y="-1609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-1575 1308,-1600 1616,-1600 1616,-1575 1308,-1575"/>
+<text text-anchor="start" x="1313" y="-1584.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_id</text>
+<text text-anchor="start" x="1380" y="-1584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1385" y="-1584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="1308,-1550 1308,-1575 1616,-1575 1616,-1550 1308,-1550"/>
+<text text-anchor="start" x="1313" y="-1559.8" font-family="Helvetica,sans-Serif" font-size="14.00">trigger_timeout</text>
+<text text-anchor="start" x="1421" y="-1559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1426" y="-1559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="1308,-1525 1308,-1550 1616,-1550 1616,-1525 1308,-1525"/>
+<text text-anchor="start" x="1313" y="-1534.8" font-family="Helvetica,sans-Serif" font-size="14.00">try_number</text>
+<text text-anchor="start" x="1395" y="-1534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1400" y="-1534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1477" y="-1534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="1308,-1500 1308,-1525 1616,-1525 1616,-1500 1308,-1500"/>
+<text text-anchor="start" x="1313" y="-1509.8" font-family="Helvetica,sans-Serif" font-size="14.00">unixname</text>
+<text text-anchor="start" x="1383" y="-1509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1388" y="-1509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<polygon fill="none" stroke="black" points="1308,-1475 1308,-1500 1616,-1500 1616,-1475 1308,-1475"/>
+<text text-anchor="start" x="1313" y="-1484.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="1392" y="-1484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1397" y="-1484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_history -->
-<g id="edge58" class="edge">
+<g id="edge54" class="edge">
 <title>task_instance&#45;&#45;task_instance_history</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2414.84C1256.12,-2495.74 1289.24,-2581.24 1320.77,-2663.28"/>
-<text text-anchor="start" x="1289.77" y="-2652.08" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2403.64" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1212.9,-2533.95C1217.67,-2521.83 1222.38,-2509.83 1227,-2498 1250.89,-2436.79 1275.72,-2372.02 1299.88,-2308.6"/>
+<text text-anchor="start" x="1268.88" y="-2297.4" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1202.9" y="-2522.75" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_history -->
-<g id="edge59" class="edge">
+<g id="edge55" class="edge">
 <title>task_instance&#45;&#45;task_instance_history</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1224.53,-2428.03C1255.49,-2507.73 1287.92,-2591.43 1318.88,-2671.56"/>
-<text text-anchor="start" x="1287.88" y="-2675.36" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1224.53" y="-2431.83" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.04,-2546.52C1219.08,-2536.24 1223.07,-2526.06 1227,-2516 1250.89,-2454.79 1275.72,-2390.02 1299.88,-2326.4"/>
+<text text-anchor="start" x="1268.88" y="-2315.2" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.04" y="-2535.32" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_history -->
-<g id="edge60" class="edge">
+<g id="edge56" class="edge">
 <title>task_instance&#45;&#45;task_instance_history</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1223.04,-2437.36C1254.49,-2518.74 1287.5,-2603.96 1318.99,-2685.03"/>
-<text text-anchor="start" x="1287.99" y="-2688.83" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1213.04" y="-2441.16" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.04,-2564.51C1219.08,-2554.24 1223.07,-2544.06 1227,-2534 1252.31,-2469.15 1278.67,-2400.32 1304.18,-2332.86"/>
+<text text-anchor="start" x="1273.18" y="-2336.66" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.04" y="-2553.31" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- task_instance&#45;&#45;task_instance_history -->
-<g id="edge61" class="edge">
+<g id="edge57" class="edge">
 <title>task_instance&#45;&#45;task_instance_history</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1217.85,-2437.02C1250.79,-2522.8 1285.66,-2612.86 1318.85,-2697.85"/>
-<text text-anchor="start" x="1287.85" y="-2701.65" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="1207.85" y="-2440.82" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M1215.04,-2582.51C1219.08,-2572.24 1223.07,-2562.06 1227,-2552 1254.57,-2481.37 1283.38,-2406.01 1310.98,-2332.53"/>
+<text text-anchor="start" x="1310.98" y="-2336.33" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="1215.04" y="-2571.31" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- backfill -->
 <g id="node33" class="node">
 <title>backfill</title>
-<polygon fill="none" stroke="black" points="14.5,-2869 14.5,-2897 299.5,-2897 299.5,-2869 14.5,-2869"/>
-<text text-anchor="start" x="124.5" y="-2880.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">backfill</text>
-<polygon fill="none" stroke="black" points="14.5,-2844 14.5,-2869 299.5,-2869 299.5,-2844 14.5,-2844"/>
-<text text-anchor="start" x="19.5" y="-2853.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="32.5" y="-2853.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="37.5" y="-2853.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="114.5" y="-2853.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2819 14.5,-2844 299.5,-2844 299.5,-2819 14.5,-2819"/>
-<text text-anchor="start" x="19.5" y="-2828.8" font-family="Helvetica,sans-Serif" font-size="14.00">completed_at</text>
-<text text-anchor="start" x="113.5" y="-2828.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="118.5" y="-2828.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="14.5,-2794 14.5,-2819 299.5,-2819 299.5,-2794 14.5,-2794"/>
-<text text-anchor="start" x="19.5" y="-2803.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
-<text text-anchor="start" x="92.5" y="-2803.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="97.5" y="-2803.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="193.5" y="-2803.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2769 14.5,-2794 299.5,-2794 299.5,-2769 14.5,-2769"/>
-<text text-anchor="start" x="19.5" y="-2778.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
-<text text-anchor="start" x="65.5" y="-2778.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="70.5" y="-2778.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="191.5" y="-2778.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2744 14.5,-2769 299.5,-2769 299.5,-2744 14.5,-2744"/>
-<text text-anchor="start" x="19.5" y="-2753.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_run_conf</text>
-<text text-anchor="start" x="113.5" y="-2753.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="118.5" y="-2753.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
-<polygon fill="none" stroke="black" points="14.5,-2719 14.5,-2744 299.5,-2744 299.5,-2719 14.5,-2719"/>
-<text text-anchor="start" x="19.5" y="-2728.8" font-family="Helvetica,sans-Serif" font-size="14.00">from_date</text>
-<text text-anchor="start" x="89.5" y="-2728.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="94.5" y="-2728.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="190.5" y="-2728.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2694 14.5,-2719 299.5,-2719 299.5,-2694 14.5,-2694"/>
-<text text-anchor="start" x="19.5" y="-2703.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_paused</text>
-<text text-anchor="start" x="89.5" y="-2703.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="94.5" y="-2703.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="14.5,-2669 14.5,-2694 299.5,-2694 299.5,-2669 14.5,-2669"/>
-<text text-anchor="start" x="19.5" y="-2678.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_runs</text>
-<text text-anchor="start" x="136.5" y="-2678.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="141.5" y="-2678.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="218.5" y="-2678.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2644 14.5,-2669 299.5,-2669 299.5,-2644 14.5,-2644"/>
-<text text-anchor="start" x="19.5" y="-2653.8" font-family="Helvetica,sans-Serif" font-size="14.00">to_date</text>
-<text text-anchor="start" x="71.5" y="-2653.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="76.5" y="-2653.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="172.5" y="-2653.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="14.5,-2619 14.5,-2644 299.5,-2644 299.5,-2619 14.5,-2619"/>
-<text text-anchor="start" x="19.5" y="-2628.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
-<text text-anchor="start" x="98.5" y="-2628.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="103.5" y="-2628.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="199.5" y="-2628.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2675 14.5,-2703 299.5,-2703 299.5,-2675 14.5,-2675"/>
+<text text-anchor="start" x="124.5" y="-2686.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">backfill</text>
+<polygon fill="none" stroke="black" points="14.5,-2650 14.5,-2675 299.5,-2675 299.5,-2650 14.5,-2650"/>
+<text text-anchor="start" x="19.5" y="-2659.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="32.5" y="-2659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="37.5" y="-2659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="114.5" y="-2659.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2625 14.5,-2650 299.5,-2650 299.5,-2625 14.5,-2625"/>
+<text text-anchor="start" x="19.5" y="-2634.8" font-family="Helvetica,sans-Serif" font-size="14.00">completed_at</text>
+<text text-anchor="start" x="113.5" y="-2634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="118.5" y="-2634.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="14.5,-2600 14.5,-2625 299.5,-2625 299.5,-2600 14.5,-2600"/>
+<text text-anchor="start" x="19.5" y="-2609.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_at</text>
+<text text-anchor="start" x="92.5" y="-2609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="97.5" y="-2609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="193.5" y="-2609.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2575 14.5,-2600 299.5,-2600 299.5,-2575 14.5,-2575"/>
+<text text-anchor="start" x="19.5" y="-2584.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_id</text>
+<text text-anchor="start" x="65.5" y="-2584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="70.5" y="-2584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="191.5" y="-2584.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2550 14.5,-2575 299.5,-2575 299.5,-2550 14.5,-2550"/>
+<text text-anchor="start" x="19.5" y="-2559.8" font-family="Helvetica,sans-Serif" font-size="14.00">dag_run_conf</text>
+<text text-anchor="start" x="113.5" y="-2559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="118.5" y="-2559.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [JSON]</text>
+<polygon fill="none" stroke="black" points="14.5,-2525 14.5,-2550 299.5,-2550 299.5,-2525 14.5,-2525"/>
+<text text-anchor="start" x="19.5" y="-2534.8" font-family="Helvetica,sans-Serif" font-size="14.00">from_date</text>
+<text text-anchor="start" x="89.5" y="-2534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="94.5" y="-2534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="190.5" y="-2534.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2500 14.5,-2525 299.5,-2525 299.5,-2500 14.5,-2500"/>
+<text text-anchor="start" x="19.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00">is_paused</text>
+<text text-anchor="start" x="89.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="94.5" y="-2509.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="14.5,-2475 14.5,-2500 299.5,-2500 299.5,-2475 14.5,-2475"/>
+<text text-anchor="start" x="19.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00">max_active_runs</text>
+<text text-anchor="start" x="136.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="141.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="218.5" y="-2484.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2450 14.5,-2475 299.5,-2475 299.5,-2450 14.5,-2450"/>
+<text text-anchor="start" x="19.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00">to_date</text>
+<text text-anchor="start" x="71.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="76.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="172.5" y="-2459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="14.5,-2425 14.5,-2450 299.5,-2450 299.5,-2425 14.5,-2425"/>
+<text text-anchor="start" x="19.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00">updated_at</text>
+<text text-anchor="start" x="98.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="103.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="199.5" y="-2434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- backfill&#45;&#45;dag_run -->
-<g id="edge31" class="edge">
+<g id="edge27" class="edge">
 <title>backfill&#45;&#45;dag_run</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M307.14,-2665.99C352.06,-2638.38 401.3,-2608.1 446.16,-2580.52"/>
-<text text-anchor="start" x="415.16" y="-2569.32" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="307.14" y="-2654.79" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M307.14,-2696.71C352.06,-2736.54 401.3,-2780.22 446.16,-2820"/>
+<text text-anchor="start" x="415.16" y="-2808.8" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="307.14" y="-2685.51" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- backfill&#45;&#45;backfill_dag_run -->
-<g id="edge32" class="edge">
+<g id="edge28" class="edge">
 <title>backfill&#45;&#45;backfill_dag_run</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M307.06,-2772.34C333.34,-2774.5 360.46,-2776.51 386,-2778 570.18,-2788.78 782.97,-2793.86 919.72,-2796.18"/>
-<text text-anchor="start" x="888.72" y="-2784.98" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="307.06" y="-2761.14" font-family="Times,serif" font-size="14.00">1</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M307.13,-2504.96C333.1,-2496.45 360.1,-2488.66 386,-2483 564.2,-2444.04 774.54,-2430.3 910.44,-2425.5"/>
+<text text-anchor="start" x="879.44" y="-2414.3" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="307.13" y="-2493.76" font-family="Times,serif" font-size="14.00">1</text>
 </g>
 <!-- trigger -->
 <g id="node34" class="node">
 <title>trigger</title>
-<polygon fill="none" stroke="black" points="452,-2067 452,-2095 740,-2095 740,-2067 452,-2067"/>
-<text text-anchor="start" x="564.5" y="-2078.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">trigger</text>
-<polygon fill="none" stroke="black" points="452,-2042 452,-2067 740,-2067 740,-2042 452,-2042"/>
-<text text-anchor="start" x="457" y="-2051.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="470" y="-2051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="475" y="-2051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="552" y="-2051.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="452,-2017 452,-2042 740,-2042 740,-2017 452,-2017"/>
-<text text-anchor="start" x="457" y="-2026.8" font-family="Helvetica,sans-Serif" font-size="14.00">classpath</text>
-<text text-anchor="start" x="524" y="-2026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="529" y="-2026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
-<text text-anchor="start" x="659" y="-2026.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="452,-1992 452,-2017 740,-2017 740,-1992 452,-1992"/>
-<text text-anchor="start" x="457" y="-2001.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_date</text>
-<text text-anchor="start" x="547" y="-2001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="552" y="-2001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<text text-anchor="start" x="648" y="-2001.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="452,-1967 452,-1992 740,-1992 740,-1967 452,-1967"/>
-<text text-anchor="start" x="457" y="-1976.8" font-family="Helvetica,sans-Serif" font-size="14.00">kwargs</text>
-<text text-anchor="start" x="507" y="-1976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="512" y="-1976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
-<text text-anchor="start" x="562" y="-1976.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="452,-1942 452,-1967 740,-1967 740,-1942 452,-1942"/>
-<text text-anchor="start" x="457" y="-1951.8" font-family="Helvetica,sans-Serif" font-size="14.00">triggerer_id</text>
-<text text-anchor="start" x="538" y="-1951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="543" y="-1951.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="452,-2621 452,-2649 740,-2649 740,-2621 452,-2621"/>
+<text text-anchor="start" x="564.5" y="-2632.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">trigger</text>
+<polygon fill="none" stroke="black" points="452,-2596 452,-2621 740,-2621 740,-2596 452,-2596"/>
+<text text-anchor="start" x="457" y="-2605.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="470" y="-2605.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="475" y="-2605.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="552" y="-2605.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="452,-2571 452,-2596 740,-2596 740,-2571 452,-2571"/>
+<text text-anchor="start" x="457" y="-2580.8" font-family="Helvetica,sans-Serif" font-size="14.00">classpath</text>
+<text text-anchor="start" x="524" y="-2580.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="529" y="-2580.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(1000)]</text>
+<text text-anchor="start" x="659" y="-2580.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="452,-2546 452,-2571 740,-2571 740,-2546 452,-2546"/>
+<text text-anchor="start" x="457" y="-2555.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_date</text>
+<text text-anchor="start" x="547" y="-2555.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="552" y="-2555.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<text text-anchor="start" x="648" y="-2555.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="452,-2521 452,-2546 740,-2546 740,-2521 452,-2521"/>
+<text text-anchor="start" x="457" y="-2530.8" font-family="Helvetica,sans-Serif" font-size="14.00">kwargs</text>
+<text text-anchor="start" x="507" y="-2530.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="512" y="-2530.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TEXT]</text>
+<text text-anchor="start" x="562" y="-2530.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="452,-2496 452,-2521 740,-2521 740,-2496 452,-2496"/>
+<text text-anchor="start" x="457" y="-2505.8" font-family="Helvetica,sans-Serif" font-size="14.00">triggerer_id</text>
+<text text-anchor="start" x="538" y="-2505.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="543" y="-2505.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
 </g>
 <!-- trigger&#45;&#45;task_instance -->
-<g id="edge33" class="edge">
+<g id="edge29" class="edge">
 <title>trigger&#45;&#45;task_instance</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M748.13,-2019C796.86,-2019 851.04,-2019 900.45,-2019"/>
-<text text-anchor="start" x="869.45" y="-2007.8" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="748.13" y="-2007.8" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M748.09,-2627.24C768.4,-2637.38 788.3,-2648.96 806,-2662 835.77,-2683.93 864.28,-2710.14 890.67,-2737.71"/>
+<text text-anchor="start" x="859.67" y="-2726.51" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="748.09" y="-2616.04" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- session -->
 <g id="node41" class="node">
 <title>session</title>
-<polygon fill="none" stroke="black" points="52.5,-3337 52.5,-3365 260.5,-3365 260.5,-3337 52.5,-3337"/>
-<text text-anchor="start" x="122.5" y="-3348.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">session</text>
-<polygon fill="none" stroke="black" points="52.5,-3312 52.5,-3337 260.5,-3337 260.5,-3312 52.5,-3312"/>
-<text text-anchor="start" x="57.5" y="-3321.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="70.5" y="-3321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="75.5" y="-3321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="152.5" y="-3321.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="52.5,-3287 52.5,-3312 260.5,-3312 260.5,-3287 52.5,-3287"/>
-<text text-anchor="start" x="57.5" y="-3296.8" font-family="Helvetica,sans-Serif" font-size="14.00">data</text>
-<text text-anchor="start" x="88.5" y="-3296.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="93.5" y="-3296.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
-<polygon fill="none" stroke="black" points="52.5,-3262 52.5,-3287 260.5,-3287 260.5,-3262 52.5,-3262"/>
-<text text-anchor="start" x="57.5" y="-3271.8" font-family="Helvetica,sans-Serif" font-size="14.00">expiry</text>
-<text text-anchor="start" x="101.5" y="-3271.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="106.5" y="-3271.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="52.5,-3237 52.5,-3262 260.5,-3262 260.5,-3237 52.5,-3237"/>
-<text text-anchor="start" x="57.5" y="-3246.8" font-family="Helvetica,sans-Serif" font-size="14.00">session_id</text>
-<text text-anchor="start" x="129.5" y="-3246.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="134.5" y="-3246.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(255)]</text>
+<polygon fill="none" stroke="black" points="52.5,-3553 52.5,-3581 260.5,-3581 260.5,-3553 52.5,-3553"/>
+<text text-anchor="start" x="122.5" y="-3564.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">session</text>
+<polygon fill="none" stroke="black" points="52.5,-3528 52.5,-3553 260.5,-3553 260.5,-3528 52.5,-3528"/>
+<text text-anchor="start" x="57.5" y="-3537.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="70.5" y="-3537.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="75.5" y="-3537.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="152.5" y="-3537.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="52.5,-3503 52.5,-3528 260.5,-3528 260.5,-3503 52.5,-3503"/>
+<text text-anchor="start" x="57.5" y="-3512.8" font-family="Helvetica,sans-Serif" font-size="14.00">data</text>
+<text text-anchor="start" x="88.5" y="-3512.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="93.5" y="-3512.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BYTEA]</text>
+<polygon fill="none" stroke="black" points="52.5,-3478 52.5,-3503 260.5,-3503 260.5,-3478 52.5,-3478"/>
+<text text-anchor="start" x="57.5" y="-3487.8" font-family="Helvetica,sans-Serif" font-size="14.00">expiry</text>
+<text text-anchor="start" x="101.5" y="-3487.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="106.5" y="-3487.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="52.5,-3453 52.5,-3478 260.5,-3478 260.5,-3453 52.5,-3453"/>
+<text text-anchor="start" x="57.5" y="-3462.8" font-family="Helvetica,sans-Serif" font-size="14.00">session_id</text>
+<text text-anchor="start" x="129.5" y="-3462.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="134.5" y="-3462.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(255)]</text>
 </g>
 <!-- alembic_version -->
 <g id="node42" class="node">
 <title>alembic_version</title>
-<polygon fill="none" stroke="black" points="10.5,-3939 10.5,-3967 303.5,-3967 303.5,-3939 10.5,-3939"/>
-<text text-anchor="start" x="84.5" y="-3950.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">alembic_version</text>
-<polygon fill="none" stroke="black" points="10.5,-3914 10.5,-3939 303.5,-3939 303.5,-3914 10.5,-3914"/>
-<text text-anchor="start" x="15.5" y="-3923.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">version_num</text>
-<text text-anchor="start" x="105.5" y="-3923.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="110.5" y="-3923.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
-<text text-anchor="start" x="222.5" y="-3923.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="10.5,-4331 10.5,-4359 303.5,-4359 303.5,-4331 10.5,-4331"/>
+<text text-anchor="start" x="84.5" y="-4342.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">alembic_version</text>
+<polygon fill="none" stroke="black" points="10.5,-4306 10.5,-4331 303.5,-4331 303.5,-4306 10.5,-4306"/>
+<text text-anchor="start" x="15.5" y="-4315.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">version_num</text>
+<text text-anchor="start" x="105.5" y="-4315.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="110.5" y="-4315.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
+<text text-anchor="start" x="222.5" y="-4315.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_user -->
 <g id="node43" class="node">
 <title>ab_user</title>
-<polygon fill="none" stroke="black" points="453,-4879 453,-4907 739,-4907 739,-4879 453,-4879"/>
-<text text-anchor="start" x="561" y="-4890.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_user</text>
-<polygon fill="none" stroke="black" points="453,-4854 453,-4879 739,-4879 739,-4854 453,-4854"/>
-<text text-anchor="start" x="458" y="-4863.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="471" y="-4863.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="476" y="-4863.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="553" y="-4863.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="453,-4829 453,-4854 739,-4854 739,-4829 453,-4829"/>
-<text text-anchor="start" x="458" y="-4838.8" font-family="Helvetica,sans-Serif" font-size="14.00">active</text>
-<text text-anchor="start" x="500" y="-4838.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="505" y="-4838.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
-<polygon fill="none" stroke="black" points="453,-4804 453,-4829 739,-4829 739,-4804 453,-4804"/>
-<text text-anchor="start" x="458" y="-4813.8" font-family="Helvetica,sans-Serif" font-size="14.00">changed_by_fk</text>
-<text text-anchor="start" x="563" y="-4813.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="568" y="-4813.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="453,-4779 453,-4804 739,-4804 739,-4779 453,-4779"/>
-<text text-anchor="start" x="458" y="-4788.8" font-family="Helvetica,sans-Serif" font-size="14.00">changed_on</text>
-<text text-anchor="start" x="543" y="-4788.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="548" y="-4788.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="453,-4754 453,-4779 739,-4779 739,-4754 453,-4754"/>
-<text text-anchor="start" x="458" y="-4763.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_by_fk</text>
-<text text-anchor="start" x="555" y="-4763.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="560" y="-4763.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="453,-4729 453,-4754 739,-4754 739,-4729 453,-4729"/>
-<text text-anchor="start" x="458" y="-4738.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_on</text>
-<text text-anchor="start" x="534" y="-4738.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="539" y="-4738.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="453,-4704 453,-4729 739,-4729 739,-4704 453,-4704"/>
-<text text-anchor="start" x="458" y="-4713.8" font-family="Helvetica,sans-Serif" font-size="14.00">email</text>
-<text text-anchor="start" x="496" y="-4713.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="501" y="-4713.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
-<text text-anchor="start" x="622" y="-4713.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="453,-4679 453,-4704 739,-4704 739,-4679 453,-4679"/>
-<text text-anchor="start" x="458" y="-4688.8" font-family="Helvetica,sans-Serif" font-size="14.00">fail_login_count</text>
-<text text-anchor="start" x="566" y="-4688.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="571" y="-4688.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="453,-4654 453,-4679 739,-4679 739,-4654 453,-4654"/>
-<text text-anchor="start" x="458" y="-4663.8" font-family="Helvetica,sans-Serif" font-size="14.00">first_name</text>
-<text text-anchor="start" x="532" y="-4663.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="537" y="-4663.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="658" y="-4663.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="453,-4629 453,-4654 739,-4654 739,-4629 453,-4629"/>
-<text text-anchor="start" x="458" y="-4638.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_login</text>
-<text text-anchor="start" x="524" y="-4638.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="529" y="-4638.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="453,-4604 453,-4629 739,-4629 739,-4604 453,-4604"/>
-<text text-anchor="start" x="458" y="-4613.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_name</text>
-<text text-anchor="start" x="529" y="-4613.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="534" y="-4613.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="655" y="-4613.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="453,-4579 453,-4604 739,-4604 739,-4579 453,-4579"/>
-<text text-anchor="start" x="458" y="-4588.8" font-family="Helvetica,sans-Serif" font-size="14.00">login_count</text>
-<text text-anchor="start" x="538" y="-4588.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="543" y="-4588.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="453,-4554 453,-4579 739,-4579 739,-4554 453,-4554"/>
-<text text-anchor="start" x="458" y="-4563.8" font-family="Helvetica,sans-Serif" font-size="14.00">password</text>
-<text text-anchor="start" x="525" y="-4563.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="530" y="-4563.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<polygon fill="none" stroke="black" points="453,-4529 453,-4554 739,-4554 739,-4529 453,-4529"/>
-<text text-anchor="start" x="458" y="-4538.8" font-family="Helvetica,sans-Serif" font-size="14.00">username</text>
-<text text-anchor="start" x="528" y="-4538.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="533" y="-4538.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
-<text text-anchor="start" x="654" y="-4538.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="453,-5358 453,-5386 739,-5386 739,-5358 453,-5358"/>
+<text text-anchor="start" x="561" y="-5369.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_user</text>
+<polygon fill="none" stroke="black" points="453,-5333 453,-5358 739,-5358 739,-5333 453,-5333"/>
+<text text-anchor="start" x="458" y="-5342.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="471" y="-5342.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="476" y="-5342.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="553" y="-5342.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="453,-5308 453,-5333 739,-5333 739,-5308 453,-5308"/>
+<text text-anchor="start" x="458" y="-5317.8" font-family="Helvetica,sans-Serif" font-size="14.00">active</text>
+<text text-anchor="start" x="500" y="-5317.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="505" y="-5317.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [BOOLEAN]</text>
+<polygon fill="none" stroke="black" points="453,-5283 453,-5308 739,-5308 739,-5283 453,-5283"/>
+<text text-anchor="start" x="458" y="-5292.8" font-family="Helvetica,sans-Serif" font-size="14.00">changed_by_fk</text>
+<text text-anchor="start" x="563" y="-5292.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="568" y="-5292.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="453,-5258 453,-5283 739,-5283 739,-5258 453,-5258"/>
+<text text-anchor="start" x="458" y="-5267.8" font-family="Helvetica,sans-Serif" font-size="14.00">changed_on</text>
+<text text-anchor="start" x="543" y="-5267.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="548" y="-5267.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="453,-5233 453,-5258 739,-5258 739,-5233 453,-5233"/>
+<text text-anchor="start" x="458" y="-5242.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_by_fk</text>
+<text text-anchor="start" x="555" y="-5242.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="560" y="-5242.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="453,-5208 453,-5233 739,-5233 739,-5208 453,-5208"/>
+<text text-anchor="start" x="458" y="-5217.8" font-family="Helvetica,sans-Serif" font-size="14.00">created_on</text>
+<text text-anchor="start" x="534" y="-5217.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="539" y="-5217.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="453,-5183 453,-5208 739,-5208 739,-5183 453,-5183"/>
+<text text-anchor="start" x="458" y="-5192.8" font-family="Helvetica,sans-Serif" font-size="14.00">email</text>
+<text text-anchor="start" x="496" y="-5192.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="501" y="-5192.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
+<text text-anchor="start" x="622" y="-5192.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="453,-5158 453,-5183 739,-5183 739,-5158 453,-5158"/>
+<text text-anchor="start" x="458" y="-5167.8" font-family="Helvetica,sans-Serif" font-size="14.00">fail_login_count</text>
+<text text-anchor="start" x="566" y="-5167.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="571" y="-5167.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="453,-5133 453,-5158 739,-5158 739,-5133 453,-5133"/>
+<text text-anchor="start" x="458" y="-5142.8" font-family="Helvetica,sans-Serif" font-size="14.00">first_name</text>
+<text text-anchor="start" x="532" y="-5142.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="537" y="-5142.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="658" y="-5142.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="453,-5108 453,-5133 739,-5133 739,-5108 453,-5108"/>
+<text text-anchor="start" x="458" y="-5117.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_login</text>
+<text text-anchor="start" x="524" y="-5117.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="529" y="-5117.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="453,-5083 453,-5108 739,-5108 739,-5083 453,-5083"/>
+<text text-anchor="start" x="458" y="-5092.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_name</text>
+<text text-anchor="start" x="529" y="-5092.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="534" y="-5092.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="655" y="-5092.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="453,-5058 453,-5083 739,-5083 739,-5058 453,-5058"/>
+<text text-anchor="start" x="458" y="-5067.8" font-family="Helvetica,sans-Serif" font-size="14.00">login_count</text>
+<text text-anchor="start" x="538" y="-5067.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="543" y="-5067.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="453,-5033 453,-5058 739,-5058 739,-5033 453,-5033"/>
+<text text-anchor="start" x="458" y="-5042.8" font-family="Helvetica,sans-Serif" font-size="14.00">password</text>
+<text text-anchor="start" x="525" y="-5042.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="530" y="-5042.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<polygon fill="none" stroke="black" points="453,-5008 453,-5033 739,-5033 739,-5008 453,-5008"/>
+<text text-anchor="start" x="458" y="-5017.8" font-family="Helvetica,sans-Serif" font-size="14.00">username</text>
+<text text-anchor="start" x="528" y="-5017.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="533" y="-5017.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
+<text text-anchor="start" x="654" y="-5017.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_user&#45;&#45;ab_user -->
-<g id="edge62" class="edge">
+<g id="edge58" class="edge">
 <title>ab_user&#45;&#45;ab_user</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M580.23,-4911.02C584.02,-4922.27 589.27,-4929 596,-4929 602.73,-4929 607.98,-4922.27 611.77,-4911.02"/>
-<text text-anchor="start" x="611.77" y="-4914.82" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="580.23" y="-4914.82" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M580.23,-5390.02C584.02,-5401.27 589.27,-5408 596,-5408 602.73,-5408 607.98,-5401.27 611.77,-5390.02"/>
+<text text-anchor="start" x="611.77" y="-5393.82" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="580.23" y="-5393.82" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_user&#45;&#45;ab_user -->
-<g id="edge63" class="edge">
+<g id="edge59" class="edge">
 <title>ab_user&#45;&#45;ab_user</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M557.05,-4911.38C564.4,-4933.01 577.38,-4947 596,-4947 614.62,-4947 627.6,-4933.01 634.95,-4911.38"/>
-<text text-anchor="start" x="634.95" y="-4915.18" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="516.05" y="-4915.18" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M557.05,-5390.38C564.4,-5412.01 577.38,-5426 596,-5426 614.62,-5426 627.6,-5412.01 634.95,-5390.38"/>
+<text text-anchor="start" x="634.95" y="-5394.18" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="516.05" y="-5394.18" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_user_role -->
 <g id="node44" class="node">
 <title>ab_user_role</title>
-<polygon fill="none" stroke="black" points="972.5,-4649 972.5,-4677 1153.5,-4677 1153.5,-4649 972.5,-4649"/>
-<text text-anchor="start" x="1006" y="-4660.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_user_role</text>
-<polygon fill="none" stroke="black" points="972.5,-4624 972.5,-4649 1153.5,-4649 1153.5,-4624 972.5,-4624"/>
-<text text-anchor="start" x="977.5" y="-4633.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="990.5" y="-4633.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="995.5" y="-4633.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1072.5" y="-4633.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="972.5,-4599 972.5,-4624 1153.5,-4624 1153.5,-4599 972.5,-4599"/>
-<text text-anchor="start" x="977.5" y="-4608.8" font-family="Helvetica,sans-Serif" font-size="14.00">role_id</text>
-<text text-anchor="start" x="1023.5" y="-4608.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1028.5" y="-4608.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="972.5,-4574 972.5,-4599 1153.5,-4599 1153.5,-4574 972.5,-4574"/>
-<text text-anchor="start" x="977.5" y="-4583.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
-<text text-anchor="start" x="1028.5" y="-4583.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1033.5" y="-4583.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="963,-5148 963,-5176 1144,-5176 1144,-5148 963,-5148"/>
+<text text-anchor="start" x="996.5" y="-5159.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_user_role</text>
+<polygon fill="none" stroke="black" points="963,-5123 963,-5148 1144,-5148 1144,-5123 963,-5123"/>
+<text text-anchor="start" x="968" y="-5132.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="981" y="-5132.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="986" y="-5132.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1063" y="-5132.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="963,-5098 963,-5123 1144,-5123 1144,-5098 963,-5098"/>
+<text text-anchor="start" x="968" y="-5107.8" font-family="Helvetica,sans-Serif" font-size="14.00">role_id</text>
+<text text-anchor="start" x="1014" y="-5107.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1019" y="-5107.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="963,-5073 963,-5098 1144,-5098 1144,-5073 963,-5073"/>
+<text text-anchor="start" x="968" y="-5082.8" font-family="Helvetica,sans-Serif" font-size="14.00">user_id</text>
+<text text-anchor="start" x="1019" y="-5082.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1024" y="-5082.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
 </g>
 <!-- ab_user&#45;&#45;ab_user_role -->
-<g id="edge64" class="edge">
+<g id="edge60" class="edge">
 <title>ab_user&#45;&#45;ab_user_role</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M747.17,-4688.26C818.2,-4674.19 901,-4657.79 963.78,-4645.36"/>
-<text text-anchor="start" x="932.78" y="-4634.16" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="747.17" y="-4677.06" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M747.25,-5173.22C815.32,-5162.45 893.87,-5150.02 954.17,-5140.48"/>
+<text text-anchor="start" x="923.17" y="-5129.28" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="747.25" y="-5162.02" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_register_user -->
 <g id="node45" class="node">
 <title>ab_register_user</title>
-<polygon fill="none" stroke="black" points="13.5,-4664 13.5,-4692 299.5,-4692 299.5,-4664 13.5,-4664"/>
-<text text-anchor="start" x="81.5" y="-4675.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_register_user</text>
-<polygon fill="none" stroke="black" points="13.5,-4639 13.5,-4664 299.5,-4664 299.5,-4639 13.5,-4639"/>
-<text text-anchor="start" x="18.5" y="-4648.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="31.5" y="-4648.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="36.5" y="-4648.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="113.5" y="-4648.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="13.5,-4614 13.5,-4639 299.5,-4639 299.5,-4614 13.5,-4614"/>
-<text text-anchor="start" x="18.5" y="-4623.8" font-family="Helvetica,sans-Serif" font-size="14.00">email</text>
-<text text-anchor="start" x="56.5" y="-4623.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="61.5" y="-4623.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
-<text text-anchor="start" x="182.5" y="-4623.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="13.5,-4589 13.5,-4614 299.5,-4614 299.5,-4589 13.5,-4589"/>
-<text text-anchor="start" x="18.5" y="-4598.8" font-family="Helvetica,sans-Serif" font-size="14.00">first_name</text>
-<text text-anchor="start" x="92.5" y="-4598.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="97.5" y="-4598.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="218.5" y="-4598.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="13.5,-4564 13.5,-4589 299.5,-4589 299.5,-4564 13.5,-4564"/>
-<text text-anchor="start" x="18.5" y="-4573.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_name</text>
-<text text-anchor="start" x="89.5" y="-4573.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="94.5" y="-4573.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<text text-anchor="start" x="215.5" y="-4573.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="13.5,-4539 13.5,-4564 299.5,-4564 299.5,-4539 13.5,-4539"/>
-<text text-anchor="start" x="18.5" y="-4548.8" font-family="Helvetica,sans-Serif" font-size="14.00">password</text>
-<text text-anchor="start" x="85.5" y="-4548.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="90.5" y="-4548.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<polygon fill="none" stroke="black" points="13.5,-4514 13.5,-4539 299.5,-4539 299.5,-4514 13.5,-4514"/>
-<text text-anchor="start" x="18.5" y="-4523.8" font-family="Helvetica,sans-Serif" font-size="14.00">registration_date</text>
-<text text-anchor="start" x="136.5" y="-4523.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="141.5" y="-4523.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
-<polygon fill="none" stroke="black" points="13.5,-4489 13.5,-4514 299.5,-4514 299.5,-4489 13.5,-4489"/>
-<text text-anchor="start" x="18.5" y="-4498.8" font-family="Helvetica,sans-Serif" font-size="14.00">registration_hash</text>
-<text text-anchor="start" x="139.5" y="-4498.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="144.5" y="-4498.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
-<polygon fill="none" stroke="black" points="13.5,-4464 13.5,-4489 299.5,-4489 299.5,-4464 13.5,-4464"/>
-<text text-anchor="start" x="18.5" y="-4473.8" font-family="Helvetica,sans-Serif" font-size="14.00">username</text>
-<text text-anchor="start" x="88.5" y="-4473.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="93.5" y="-4473.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
-<text text-anchor="start" x="214.5" y="-4473.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="13.5,-5143 13.5,-5171 299.5,-5171 299.5,-5143 13.5,-5143"/>
+<text text-anchor="start" x="81.5" y="-5154.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_register_user</text>
+<polygon fill="none" stroke="black" points="13.5,-5118 13.5,-5143 299.5,-5143 299.5,-5118 13.5,-5118"/>
+<text text-anchor="start" x="18.5" y="-5127.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="31.5" y="-5127.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="36.5" y="-5127.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="113.5" y="-5127.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="13.5,-5093 13.5,-5118 299.5,-5118 299.5,-5093 13.5,-5093"/>
+<text text-anchor="start" x="18.5" y="-5102.8" font-family="Helvetica,sans-Serif" font-size="14.00">email</text>
+<text text-anchor="start" x="56.5" y="-5102.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="61.5" y="-5102.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
+<text text-anchor="start" x="182.5" y="-5102.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="13.5,-5068 13.5,-5093 299.5,-5093 299.5,-5068 13.5,-5068"/>
+<text text-anchor="start" x="18.5" y="-5077.8" font-family="Helvetica,sans-Serif" font-size="14.00">first_name</text>
+<text text-anchor="start" x="92.5" y="-5077.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="97.5" y="-5077.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="218.5" y="-5077.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="13.5,-5043 13.5,-5068 299.5,-5068 299.5,-5043 13.5,-5043"/>
+<text text-anchor="start" x="18.5" y="-5052.8" font-family="Helvetica,sans-Serif" font-size="14.00">last_name</text>
+<text text-anchor="start" x="89.5" y="-5052.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="94.5" y="-5052.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<text text-anchor="start" x="215.5" y="-5052.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="13.5,-5018 13.5,-5043 299.5,-5043 299.5,-5018 13.5,-5018"/>
+<text text-anchor="start" x="18.5" y="-5027.8" font-family="Helvetica,sans-Serif" font-size="14.00">password</text>
+<text text-anchor="start" x="85.5" y="-5027.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="90.5" y="-5027.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<polygon fill="none" stroke="black" points="13.5,-4993 13.5,-5018 299.5,-5018 299.5,-4993 13.5,-4993"/>
+<text text-anchor="start" x="18.5" y="-5002.8" font-family="Helvetica,sans-Serif" font-size="14.00">registration_date</text>
+<text text-anchor="start" x="136.5" y="-5002.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="141.5" y="-5002.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [TIMESTAMP]</text>
+<polygon fill="none" stroke="black" points="13.5,-4968 13.5,-4993 299.5,-4993 299.5,-4968 13.5,-4968"/>
+<text text-anchor="start" x="18.5" y="-4977.8" font-family="Helvetica,sans-Serif" font-size="14.00">registration_hash</text>
+<text text-anchor="start" x="139.5" y="-4977.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="144.5" y="-4977.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(256)]</text>
+<polygon fill="none" stroke="black" points="13.5,-4943 13.5,-4968 299.5,-4968 299.5,-4943 13.5,-4943"/>
+<text text-anchor="start" x="18.5" y="-4952.8" font-family="Helvetica,sans-Serif" font-size="14.00">username</text>
+<text text-anchor="start" x="88.5" y="-4952.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="93.5" y="-4952.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(512)]</text>
+<text text-anchor="start" x="214.5" y="-4952.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_permission -->
 <g id="node46" class="node">
 <title>ab_permission</title>
-<polygon fill="none" stroke="black" points="30.5,-4410 30.5,-4438 282.5,-4438 282.5,-4410 30.5,-4410"/>
-<text text-anchor="start" x="91.5" y="-4421.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission</text>
-<polygon fill="none" stroke="black" points="30.5,-4385 30.5,-4410 282.5,-4410 282.5,-4385 30.5,-4385"/>
-<text text-anchor="start" x="35.5" y="-4394.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="48.5" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="53.5" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="130.5" y="-4394.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="30.5,-4360 30.5,-4385 282.5,-4385 282.5,-4360 30.5,-4360"/>
-<text text-anchor="start" x="35.5" y="-4369.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
-<text text-anchor="start" x="75.5" y="-4369.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="80.5" y="-4369.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(100)]</text>
-<text text-anchor="start" x="201.5" y="-4369.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="30.5,-4889 30.5,-4917 282.5,-4917 282.5,-4889 30.5,-4889"/>
+<text text-anchor="start" x="91.5" y="-4900.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission</text>
+<polygon fill="none" stroke="black" points="30.5,-4864 30.5,-4889 282.5,-4889 282.5,-4864 30.5,-4864"/>
+<text text-anchor="start" x="35.5" y="-4873.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="48.5" y="-4873.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="53.5" y="-4873.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="130.5" y="-4873.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="30.5,-4839 30.5,-4864 282.5,-4864 282.5,-4839 30.5,-4839"/>
+<text text-anchor="start" x="35.5" y="-4848.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
+<text text-anchor="start" x="75.5" y="-4848.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="80.5" y="-4848.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(100)]</text>
+<text text-anchor="start" x="201.5" y="-4848.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_permission_view -->
 <g id="node47" class="node">
 <title>ab_permission_view</title>
-<polygon fill="none" stroke="black" points="501,-4370 501,-4398 691,-4398 691,-4370 501,-4370"/>
-<text text-anchor="start" x="506.5" y="-4381.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission_view</text>
-<polygon fill="none" stroke="black" points="501,-4345 501,-4370 691,-4370 691,-4345 501,-4345"/>
-<text text-anchor="start" x="506" y="-4354.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="519" y="-4354.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="524" y="-4354.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="601" y="-4354.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="501,-4320 501,-4345 691,-4345 691,-4320 501,-4320"/>
-<text text-anchor="start" x="506" y="-4329.8" font-family="Helvetica,sans-Serif" font-size="14.00">permission_id</text>
-<text text-anchor="start" x="602" y="-4329.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="607" y="-4329.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="501,-4295 501,-4320 691,-4320 691,-4295 501,-4295"/>
-<text text-anchor="start" x="506" y="-4304.8" font-family="Helvetica,sans-Serif" font-size="14.00">view_menu_id</text>
-<text text-anchor="start" x="604" y="-4304.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="609" y="-4304.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="501,-4849 501,-4877 691,-4877 691,-4849 501,-4849"/>
+<text text-anchor="start" x="506.5" y="-4860.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission_view</text>
+<polygon fill="none" stroke="black" points="501,-4824 501,-4849 691,-4849 691,-4824 501,-4824"/>
+<text text-anchor="start" x="506" y="-4833.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="519" y="-4833.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="524" y="-4833.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="601" y="-4833.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="501,-4799 501,-4824 691,-4824 691,-4799 501,-4799"/>
+<text text-anchor="start" x="506" y="-4808.8" font-family="Helvetica,sans-Serif" font-size="14.00">permission_id</text>
+<text text-anchor="start" x="602" y="-4808.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="607" y="-4808.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="501,-4774 501,-4799 691,-4799 691,-4774 501,-4774"/>
+<text text-anchor="start" x="506" y="-4783.8" font-family="Helvetica,sans-Serif" font-size="14.00">view_menu_id</text>
+<text text-anchor="start" x="604" y="-4783.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="609" y="-4783.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
 </g>
 <!-- ab_permission&#45;&#45;ab_permission_view -->
-<g id="edge65" class="edge">
+<g id="edge61" class="edge">
 <title>ab_permission&#45;&#45;ab_permission_view</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M290.55,-4383.19C355.53,-4375.46 432.5,-4366.31 492.8,-4359.15"/>
-<text text-anchor="start" x="461.8" y="-4347.95" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="290.55" y="-4371.99" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M290.55,-4862.19C355.53,-4854.46 432.5,-4845.31 492.8,-4838.15"/>
+<text text-anchor="start" x="461.8" y="-4826.95" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="290.55" y="-4850.99" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_permission_view_role -->
 <g id="node48" class="node">
 <title>ab_permission_view_role</title>
-<polygon fill="none" stroke="black" points="946.5,-4429 946.5,-4457 1179.5,-4457 1179.5,-4429 946.5,-4429"/>
-<text text-anchor="start" x="951.5" y="-4440.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission_view_role</text>
-<polygon fill="none" stroke="black" points="946.5,-4404 946.5,-4429 1179.5,-4429 1179.5,-4404 946.5,-4404"/>
-<text text-anchor="start" x="951.5" y="-4413.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="964.5" y="-4413.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="969.5" y="-4413.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="1046.5" y="-4413.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="946.5,-4379 946.5,-4404 1179.5,-4404 1179.5,-4379 946.5,-4379"/>
-<text text-anchor="start" x="951.5" y="-4388.8" font-family="Helvetica,sans-Serif" font-size="14.00">permission_view_id</text>
-<text text-anchor="start" x="1085.5" y="-4388.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1090.5" y="-4388.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<polygon fill="none" stroke="black" points="946.5,-4354 946.5,-4379 1179.5,-4379 1179.5,-4354 946.5,-4354"/>
-<text text-anchor="start" x="951.5" y="-4363.8" font-family="Helvetica,sans-Serif" font-size="14.00">role_id</text>
-<text text-anchor="start" x="997.5" y="-4363.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="1002.5" y="-4363.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="937,-4957 937,-4985 1170,-4985 1170,-4957 937,-4957"/>
+<text text-anchor="start" x="942" y="-4968.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_permission_view_role</text>
+<polygon fill="none" stroke="black" points="937,-4932 937,-4957 1170,-4957 1170,-4932 937,-4932"/>
+<text text-anchor="start" x="942" y="-4941.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="955" y="-4941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="960" y="-4941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="1037" y="-4941.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="937,-4907 937,-4932 1170,-4932 1170,-4907 937,-4907"/>
+<text text-anchor="start" x="942" y="-4916.8" font-family="Helvetica,sans-Serif" font-size="14.00">permission_view_id</text>
+<text text-anchor="start" x="1076" y="-4916.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="1081" y="-4916.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<polygon fill="none" stroke="black" points="937,-4882 937,-4907 1170,-4907 1170,-4882 937,-4882"/>
+<text text-anchor="start" x="942" y="-4891.8" font-family="Helvetica,sans-Serif" font-size="14.00">role_id</text>
+<text text-anchor="start" x="988" y="-4891.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="993" y="-4891.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
 </g>
 <!-- ab_permission_view&#45;&#45;ab_permission_view_role -->
-<g id="edge66" class="edge">
+<g id="edge62" class="edge">
 <title>ab_permission_view&#45;&#45;ab_permission_view_role</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M699.22,-4359.98C769.47,-4368.91 863.14,-4380.81 937.64,-4390.27"/>
-<text text-anchor="start" x="906.64" y="-4379.07" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="699.22" y="-4348.78" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M699.11,-4850.24C766.97,-4866.34 856.48,-4887.59 928.37,-4904.65"/>
+<text text-anchor="start" x="897.37" y="-4893.45" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="699.11" y="-4839.04" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_view_menu -->
 <g id="node49" class="node">
 <title>ab_view_menu</title>
-<polygon fill="none" stroke="black" points="30.5,-4306 30.5,-4334 282.5,-4334 282.5,-4306 30.5,-4306"/>
-<text text-anchor="start" x="91.5" y="-4317.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_view_menu</text>
-<polygon fill="none" stroke="black" points="30.5,-4281 30.5,-4306 282.5,-4306 282.5,-4281 30.5,-4281"/>
-<text text-anchor="start" x="35.5" y="-4290.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="48.5" y="-4290.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="53.5" y="-4290.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="130.5" y="-4290.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="30.5,-4256 30.5,-4281 282.5,-4281 282.5,-4256 30.5,-4256"/>
-<text text-anchor="start" x="35.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
-<text text-anchor="start" x="75.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="80.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
-<text text-anchor="start" x="201.5" y="-4265.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="30.5,-4785 30.5,-4813 282.5,-4813 282.5,-4785 30.5,-4785"/>
+<text text-anchor="start" x="91.5" y="-4796.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_view_menu</text>
+<polygon fill="none" stroke="black" points="30.5,-4760 30.5,-4785 282.5,-4785 282.5,-4760 30.5,-4760"/>
+<text text-anchor="start" x="35.5" y="-4769.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="48.5" y="-4769.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="53.5" y="-4769.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="130.5" y="-4769.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="30.5,-4735 30.5,-4760 282.5,-4760 282.5,-4735 30.5,-4735"/>
+<text text-anchor="start" x="35.5" y="-4744.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
+<text text-anchor="start" x="75.5" y="-4744.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="80.5" y="-4744.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(250)]</text>
+<text text-anchor="start" x="201.5" y="-4744.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_view_menu&#45;&#45;ab_permission_view -->
-<g id="edge67" class="edge">
+<g id="edge63" class="edge">
 <title>ab_view_menu&#45;&#45;ab_permission_view</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M290.55,-4310.81C355.53,-4318.54 432.5,-4327.69 492.8,-4334.85"/>
-<text text-anchor="start" x="461.8" y="-4323.65" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="290.55" y="-4299.61" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M290.55,-4789.81C355.53,-4797.54 432.5,-4806.69 492.8,-4813.85"/>
+<text text-anchor="start" x="461.8" y="-4802.65" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="290.55" y="-4778.61" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_role -->
 <g id="node50" class="node">
 <title>ab_role</title>
-<polygon fill="none" stroke="black" points="475,-4475 475,-4503 718,-4503 718,-4475 475,-4475"/>
-<text text-anchor="start" x="563.5" y="-4486.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_role</text>
-<polygon fill="none" stroke="black" points="475,-4450 475,-4475 718,-4475 718,-4450 475,-4450"/>
-<text text-anchor="start" x="480" y="-4459.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
-<text text-anchor="start" x="493" y="-4459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="498" y="-4459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
-<text text-anchor="start" x="575" y="-4459.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
-<polygon fill="none" stroke="black" points="475,-4425 475,-4450 718,-4450 718,-4425 475,-4425"/>
-<text text-anchor="start" x="480" y="-4434.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
-<text text-anchor="start" x="520" y="-4434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="525" y="-4434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(64)]</text>
-<text text-anchor="start" x="637" y="-4434.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="475,-4954 475,-4982 718,-4982 718,-4954 475,-4954"/>
+<text text-anchor="start" x="563.5" y="-4965.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">ab_role</text>
+<polygon fill="none" stroke="black" points="475,-4929 475,-4954 718,-4954 718,-4929 475,-4929"/>
+<text text-anchor="start" x="480" y="-4938.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">id</text>
+<text text-anchor="start" x="493" y="-4938.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="498" y="-4938.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [INTEGER]</text>
+<text text-anchor="start" x="575" y="-4938.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="475,-4904 475,-4929 718,-4929 718,-4904 475,-4904"/>
+<text text-anchor="start" x="480" y="-4913.8" font-family="Helvetica,sans-Serif" font-size="14.00">name</text>
+<text text-anchor="start" x="520" y="-4913.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="525" y="-4913.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(64)]</text>
+<text text-anchor="start" x="637" y="-4913.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 <!-- ab_role&#45;&#45;ab_user_role -->
-<g id="edge68" class="edge">
+<g id="edge64" class="edge">
 <title>ab_role&#45;&#45;ab_user_role</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M725.61,-4492.5C752.41,-4499.41 780.31,-4507.34 806,-4516 859.2,-4533.94 916.77,-4558.27 963.77,-4579.48"/>
-<text text-anchor="start" x="932.77" y="-4568.28" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="725.61" y="-4481.3" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M725.62,-4969.79C752.55,-4976.84 780.5,-4985.26 806,-4995 858.79,-5015.17 914.71,-5044.06 959.88,-5069.48"/>
+<text text-anchor="start" x="928.88" y="-5058.28" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="725.62" y="-4958.59" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- ab_role&#45;&#45;ab_permission_view_role -->
-<g id="edge69" class="edge">
+<g id="edge65" class="edge">
 <title>ab_role&#45;&#45;ab_permission_view_role</title>
-<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M725.77,-4447.92C791.95,-4439.66 872.23,-4429.63 937.69,-4421.46"/>
-<text text-anchor="start" x="906.69" y="-4410.26" font-family="Times,serif" font-size="14.00">0..N</text>
-<text text-anchor="start" x="725.77" y="-4436.72" font-family="Times,serif" font-size="14.00">{0,1}</text>
+<path fill="none" stroke="#7f7f7f" stroke-dasharray="5,2" d="M725.56,-4940.46C789.16,-4939.2 865.56,-4937.69 928.46,-4936.44"/>
+<text text-anchor="start" x="897.46" y="-4925.24" font-family="Times,serif" font-size="14.00">0..N</text>
+<text text-anchor="start" x="725.56" y="-4929.26" font-family="Times,serif" font-size="14.00">{0,1}</text>
 </g>
 <!-- alembic_version_fab -->
 <g id="node51" class="node">
 <title>alembic_version_fab</title>
-<polygon fill="none" stroke="black" points="10.5,-4743 10.5,-4771 303.5,-4771 303.5,-4743 10.5,-4743"/>
-<text text-anchor="start" x="66.5" y="-4754.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">alembic_version_fab</text>
-<polygon fill="none" stroke="black" points="10.5,-4718 10.5,-4743 303.5,-4743 303.5,-4718 10.5,-4718"/>
-<text text-anchor="start" x="15.5" y="-4727.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">version_num</text>
-<text text-anchor="start" x="105.5" y="-4727.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
-<text text-anchor="start" x="110.5" y="-4727.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
-<text text-anchor="start" x="222.5" y="-4727.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
+<polygon fill="none" stroke="black" points="10.5,-5222 10.5,-5250 303.5,-5250 303.5,-5222 10.5,-5222"/>
+<text text-anchor="start" x="66.5" y="-5233.2" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="16.00">alembic_version_fab</text>
+<polygon fill="none" stroke="black" points="10.5,-5197 10.5,-5222 303.5,-5222 303.5,-5197 10.5,-5197"/>
+<text text-anchor="start" x="15.5" y="-5206.8" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="14.00">version_num</text>
+<text text-anchor="start" x="105.5" y="-5206.8" font-family="Helvetica,sans-Serif" font-size="14.00"> </text>
+<text text-anchor="start" x="110.5" y="-5206.8" font-family="Helvetica,sans-Serif" font-size="14.00"> [VARCHAR(32)]</text>
+<text text-anchor="start" x="222.5" y="-5206.8" font-family="Helvetica,sans-Serif" font-size="14.00"> NOT NULL</text>
 </g>
 </g>
 </svg>
diff --git a/docs/apache-airflow/migrations-ref.rst b/docs/apache-airflow/migrations-ref.rst
index dc20d341729d5..4f20299ab8867 100644
--- a/docs/apache-airflow/migrations-ref.rst
+++ b/docs/apache-airflow/migrations-ref.rst
@@ -39,7 +39,9 @@ Here's the list of all the Database Migrations that are executed via when you ru
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
 | Revision ID             | Revises ID       | Airflow Version   | Description                                                  |
 +=========================+==================+===================+==============================================================+
-| ``3a8972ecb8f9`` (head) | ``fb2d4922cd79`` | ``3.0.0``         | Add exception_reason and logical_date to BackfillDagRun.     |
+| ``05234396c6fc`` (head) | ``3a8972ecb8f9`` | ``3.0.0``         | Rename dataset as asset.                                     |
++-------------------------+------------------+-------------------+--------------------------------------------------------------+
+| ``3a8972ecb8f9``        | ``fb2d4922cd79`` | ``3.0.0``         | Add exception_reason and logical_date to BackfillDagRun.     |
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
 | ``fb2d4922cd79``        | ``5a5d66100783`` | ``3.0.0``         | Tweak AssetAliasModel to match AssetModel after AIP-76.      |
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
diff --git a/newsfragments/42023.significant.rst b/newsfragments/42023.significant.rst
new file mode 100644
index 0000000000000..9cd68cebd0d66
--- /dev/null
+++ b/newsfragments/42023.significant.rst
@@ -0,0 +1,9 @@
+**Breaking Changes**
+
+* Rename property run_type value ``dataset_triggered`` as ``asset_triggered`` in DAGRun endpoint
+
+* Rename property ``dataset_expression`` as ``asset_expression`` in DAGDetail endpoint
+
+* Change the string ``dataset_triggered`` in RUN_ID_REGEX as ``asset_triggered`` which affects the valid run id that an user can provide
+
+* Rename ``dataset`` as ``asset`` in all the database tables
diff --git a/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py b/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
index 33b7944497c3a..d831adf4d8ef7 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
+++ b/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
@@ -101,8 +101,8 @@ def time_freezer(self) -> Generator:
 
         freezer.stop()
 
-    def _create_asset_dag_run_queues(self, dag_id, dataset_id, session):
-        ddrq = AssetDagRunQueue(target_dag_id=dag_id, dataset_id=dataset_id)
+    def _create_asset_dag_run_queues(self, dag_id, asset_id, session):
+        ddrq = AssetDagRunQueue(target_dag_id=dag_id, asset_id=asset_id)
         session.add(ddrq)
         session.commit()
         return ddrq
@@ -113,12 +113,12 @@ class TestGetDagAssetQueuedEvent(TestQueuedEventEndpoint):
     def test_should_respond_200(self, session, create_dummy_dag):
         dag, _ = create_dummy_dag()
         dag_id = dag.dag_id
-        dataset_id = self._create_asset(session).id
-        self._create_asset_dag_run_queues(dag_id, dataset_id, session)
-        dataset_uri = "s3://bucket/key"
+        asset_id = self._create_asset(session).id
+        self._create_asset_dag_run_queues(dag_id, asset_id, session)
+        asset_uri = "s3://bucket/key"
 
         response = self.client.get(
-            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -131,10 +131,10 @@ def test_should_respond_200(self, session, create_dummy_dag):
 
     def test_should_respond_404(self):
         dag_id = "not_exists"
-        dataset_uri = "not_exists"
+        asset_uri = "not_exists"
 
         response = self.client.get(
-            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -151,17 +151,17 @@ class TestDeleteDagAssetQueuedEvent(TestAssetEndpoint):
     def test_delete_should_respond_204(self, session, create_dummy_dag):
         dag, _ = create_dummy_dag()
         dag_id = dag.dag_id
-        dataset_uri = "s3://bucket/key"
-        dataset_id = self._create_asset(session).id
+        asset_uri = "s3://bucket/key"
+        asset_id = self._create_asset(session).id
 
-        ddrq = AssetDagRunQueue(target_dag_id=dag_id, dataset_id=dataset_id)
+        ddrq = AssetDagRunQueue(target_dag_id=dag_id, asset_id=asset_id)
         session.add(ddrq)
         session.commit()
         conn = session.query(AssetDagRunQueue).all()
         assert len(conn) == 1
 
         response = self.client.delete(
-            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -174,10 +174,10 @@ def test_delete_should_respond_204(self, session, create_dummy_dag):
 
     def test_should_respond_404(self):
         dag_id = "not_exists"
-        dataset_uri = "not_exists"
+        asset_uri = "not_exists"
 
         response = self.client.delete(
-            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/dags/{dag_id}/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -195,8 +195,8 @@ class TestGetDagAssetQueuedEvents(TestQueuedEventEndpoint):
     def test_should_respond_200(self, session, create_dummy_dag):
         dag, _ = create_dummy_dag()
         dag_id = dag.dag_id
-        dataset_id = self._create_asset(session).id
-        self._create_asset_dag_run_queues(dag_id, dataset_id, session)
+        asset_id = self._create_asset(session).id
+        self._create_asset_dag_run_queues(dag_id, asset_id, session)
 
         response = self.client.get(
             f"/api/v1/dags/{dag_id}/assets/queuedEvent",
@@ -255,12 +255,12 @@ class TestGetDatasetQueuedEvents(TestQueuedEventEndpoint):
     def test_should_respond_200(self, session, create_dummy_dag):
         dag, _ = create_dummy_dag()
         dag_id = dag.dag_id
-        dataset_id = self._create_asset(session).id
-        self._create_asset_dag_run_queues(dag_id, dataset_id, session)
-        dataset_uri = "s3://bucket/key"
+        asset_id = self._create_asset(session).id
+        self._create_asset_dag_run_queues(dag_id, asset_id, session)
+        asset_uri = "s3://bucket/key"
 
         response = self.client.get(
-            f"/api/v1/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -277,10 +277,10 @@ def test_should_respond_200(self, session, create_dummy_dag):
         }
 
     def test_should_respond_404(self):
-        dataset_uri = "not_exists"
+        asset_uri = "not_exists"
 
         response = self.client.get(
-            f"/api/v1/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -297,12 +297,12 @@ class TestDeleteDatasetQueuedEvents(TestQueuedEventEndpoint):
     def test_delete_should_respond_204(self, session, create_dummy_dag):
         dag, _ = create_dummy_dag()
         dag_id = dag.dag_id
-        dataset_id = self._create_asset(session).id
-        self._create_asset_dag_run_queues(dag_id, dataset_id, session)
-        dataset_uri = "s3://bucket/key"
+        asset_id = self._create_asset(session).id
+        self._create_asset_dag_run_queues(dag_id, asset_id, session)
+        asset_uri = "s3://bucket/key"
 
         response = self.client.delete(
-            f"/api/v1/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
@@ -312,10 +312,10 @@ def test_delete_should_respond_204(self, session, create_dummy_dag):
         _check_last_log(session, dag_id=None, event="api.delete_asset_queued_events", execution_date=None)
 
     def test_should_respond_404(self):
-        dataset_uri = "not_exists"
+        asset_uri = "not_exists"
 
         response = self.client.delete(
-            f"/api/v1/assets/queuedEvent/{dataset_uri}",
+            f"/api/v1/assets/queuedEvent/{asset_uri}",
             environ_overrides={"REMOTE_USER": "test_queued_event"},
         )
 
diff --git a/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py b/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
index 305a7ca3459ab..a32c0a7dbddf6 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
+++ b/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
@@ -144,14 +144,14 @@ def _create_dag_model_for_details_endpoint(self, dag_id, session=None):
         session.add(dag_model)
 
     @provide_session
-    def _create_dag_model_for_details_endpoint_with_dataset_expression(self, dag_id, session=None):
+    def _create_dag_model_for_details_endpoint_with_asset_expression(self, dag_id, session=None):
         dag_model = DagModel(
             dag_id=dag_id,
             fileloc="/tmp/dag.py",
             timetable_summary="2 2 * * *",
             is_active=True,
             is_paused=False,
-            dataset_expression={
+            asset_expression={
                 "any": [
                     "s3://dag1/output_1.txt",
                     {"all": ["s3://dag2/output_1.txt", "s3://dag3/output_3.txt"]},
diff --git a/tests/api_connexion/endpoints/test_asset_endpoint.py b/tests/api_connexion/endpoints/test_asset_endpoint.py
index a790fb986f255..4d195b5d870e1 100644
--- a/tests/api_connexion/endpoints/test_asset_endpoint.py
+++ b/tests/api_connexion/endpoints/test_asset_endpoint.py
@@ -261,9 +261,9 @@ def test_filter_assets_by_dag_ids_works(self, dag_ids, expected_num, session):
         asset1 = AssetModel("s3://folder/key")
         asset2 = AssetModel("gcp://bucket/key")
         asset3 = AssetModel("somescheme://asset/key")
-        dag_ref1 = DagScheduleAssetReference(dag_id="dag1", dataset=asset1)
-        dag_ref2 = DagScheduleAssetReference(dag_id="dag2", dataset=asset2)
-        task_ref1 = TaskOutletAssetReference(dag_id="dag3", task_id="task1", dataset=asset3)
+        dag_ref1 = DagScheduleAssetReference(dag_id="dag1", asset=asset1)
+        dag_ref2 = DagScheduleAssetReference(dag_id="dag2", asset=asset2)
+        task_ref1 = TaskOutletAssetReference(dag_id="dag3", task_id="task1", asset=asset3)
         session.add_all([asset1, asset2, asset3, dag1, dag2, dag3, dag_ref1, dag_ref2, task_ref1])
         session.commit()
         response = self.client.get(
@@ -288,9 +288,9 @@ def test_filter_assets_by_dag_ids_and_uri_pattern_works(
         asset1 = AssetModel("s3://folder/key")
         asset2 = AssetModel("gcp://bucket/key")
         asset3 = AssetModel("somescheme://asset/key")
-        dag_ref1 = DagScheduleAssetReference(dag_id="dag1", dataset=asset1)
-        dag_ref2 = DagScheduleAssetReference(dag_id="dag2", dataset=asset2)
-        task_ref1 = TaskOutletAssetReference(dag_id="dag3", task_id="task1", dataset=asset3)
+        dag_ref1 = DagScheduleAssetReference(dag_id="dag1", asset=asset1)
+        dag_ref2 = DagScheduleAssetReference(dag_id="dag2", asset=asset2)
+        task_ref1 = TaskOutletAssetReference(dag_id="dag3", task_id="task1", asset=asset3)
         session.add_all([asset1, asset2, asset3, dag1, dag2, dag3, dag_ref1, dag_ref2, task_ref1])
         session.commit()
         response = self.client.get(
@@ -378,7 +378,7 @@ class TestGetAssetEvents(TestAssetEndpoint):
     def test_should_respond_200(self, session):
         d = self._create_asset(session)
         common = {
-            "dataset_id": 1,
+            "asset_id": 1,
             "extra": {"foo": "bar"},
             "source_dag_id": "foo",
             "source_task_id": "bar",
@@ -402,13 +402,13 @@ def test_should_respond_200(self, session):
                     "id": 1,
                     "timestamp": self.default_time,
                     **common,
-                    "dataset_uri": d.uri,
+                    "asset_uri": d.uri,
                 },
                 {
                     "id": 2,
                     "timestamp": self.default_time,
                     **common,
-                    "dataset_uri": d.uri,
+                    "asset_uri": d.uri,
                 },
             ],
             "total_entries": 2,
@@ -441,7 +441,7 @@ def test_filtering(self, attr, value, session):
         events = [
             AssetEvent(
                 id=i,
-                dataset_id=i,
+                asset_id=i,
                 source_dag_id=f"dag{i}",
                 source_task_id=f"task{i}",
                 source_run_id=f"run{i}",
@@ -464,8 +464,8 @@ def test_filtering(self, attr, value, session):
             "asset_events": [
                 {
                     "id": 2,
-                    "dataset_id": 2,
-                    "dataset_uri": assets[1].uri,
+                    "asset_id": 2,
+                    "asset_uri": assets[1].uri,
                     "extra": {},
                     "source_dag_id": "dag2",
                     "source_task_id": "task2",
@@ -482,7 +482,7 @@ def test_order_by_raises_400_for_invalid_attr(self, session):
         self._create_asset(session)
         events = [
             AssetEvent(
-                dataset_id=1,
+                asset_id=1,
                 extra="{'foo': 'bar'}",
                 source_dag_id="foo",
                 source_task_id="bar",
@@ -512,7 +512,7 @@ def test_includes_created_dagrun(self, session):
         self._create_asset(session)
         event = AssetEvent(
             id=1,
-            dataset_id=1,
+            asset_id=1,
             timestamp=timezone.parse(self.default_time),
         )
         session.add(event)
@@ -521,7 +521,7 @@ def test_includes_created_dagrun(self, session):
         dagrun = DagRun(
             dag_id="TEST_DAG_ID",
             run_id="TEST_DAG_RUN_ID",
-            run_type=DagRunType.DATASET_TRIGGERED,
+            run_type=DagRunType.ASSET_TRIGGERED,
             execution_date=timezone.parse(self.default_time),
             start_date=timezone.parse(self.default_time),
             external_trigger=True,
@@ -542,8 +542,8 @@ def test_includes_created_dagrun(self, session):
             "asset_events": [
                 {
                     "id": 1,
-                    "dataset_id": 1,
-                    "dataset_uri": "s3://bucket/key",
+                    "asset_id": 1,
+                    "asset_uri": "s3://bucket/key",
                     "extra": {},
                     "source_dag_id": None,
                     "source_task_id": None,
@@ -591,8 +591,8 @@ def test_should_respond_200(self, session):
         assert response_data == {
             "id": ANY,
             "created_dagruns": [],
-            "dataset_uri": event_payload["asset_uri"],
-            "dataset_id": ANY,
+            "asset_uri": event_payload["asset_uri"],
+            "asset_id": ANY,
             "extra": {"foo": "bar", "from_rest_api": True},
             "source_dag_id": None,
             "source_task_id": None,
@@ -671,7 +671,7 @@ def test_limit_and_offset(self, url, expected_event_runids, session):
         self._create_asset(session)
         events = [
             AssetEvent(
-                dataset_id=1,
+                asset_id=1,
                 source_dag_id="foo",
                 source_task_id="bar",
                 source_run_id=f"run{i}",
@@ -693,7 +693,7 @@ def test_should_respect_page_size_limit_default(self, session):
         self._create_asset(session)
         events = [
             AssetEvent(
-                dataset_id=1,
+                asset_id=1,
                 source_dag_id="foo",
                 source_task_id="bar",
                 source_run_id=f"run{i}",
@@ -715,7 +715,7 @@ def test_should_return_conf_max_if_req_max_above_conf(self, session):
         self._create_asset(session)
         events = [
             AssetEvent(
-                dataset_id=1,
+                asset_id=1,
                 source_dag_id="foo",
                 source_task_id="bar",
                 source_run_id=f"run{i}",
@@ -746,7 +746,7 @@ def time_freezer(self) -> Generator:
         freezer.stop()
 
     def _create_asset_dag_run_queues(self, dag_id, asset_id, session):
-        adrq = AssetDagRunQueue(target_dag_id=dag_id, dataset_id=asset_id)
+        adrq = AssetDagRunQueue(target_dag_id=dag_id, asset_id=asset_id)
         session.add(adrq)
         session.commit()
         return adrq
diff --git a/tests/api_connexion/endpoints/test_dag_endpoint.py b/tests/api_connexion/endpoints/test_dag_endpoint.py
index f197b24f0a406..41b77d6191aaf 100644
--- a/tests/api_connexion/endpoints/test_dag_endpoint.py
+++ b/tests/api_connexion/endpoints/test_dag_endpoint.py
@@ -132,14 +132,14 @@ def _create_dag_model_for_details_endpoint(self, dag_id, session=None):
         session.add(dag_model)
 
     @provide_session
-    def _create_dag_model_for_details_endpoint_with_dataset_expression(self, dag_id, session=None):
+    def _create_dag_model_for_details_endpoint_with_asset_expression(self, dag_id, session=None):
         dag_model = DagModel(
             dag_id=dag_id,
             fileloc="/tmp/dag.py",
             timetable_summary="2 2 * * *",
             is_active=True,
             is_paused=False,
-            dataset_expression={
+            asset_expression={
                 "any": [
                     "s3://dag1/output_1.txt",
                     {"all": ["s3://dag2/output_1.txt", "s3://dag3/output_3.txt"]},
@@ -300,7 +300,7 @@ def test_should_respond_200(self, url_safe_serializer):
             "dag_id": "test_dag",
             "dag_display_name": "test_dag",
             "dag_run_timeout": None,
-            "dataset_expression": None,
+            "asset_expression": None,
             "default_view": None,
             "description": None,
             "doc_md": "details",
@@ -345,8 +345,8 @@ def test_should_respond_200(self, url_safe_serializer):
         }
         assert response.json == expected
 
-    def test_should_respond_200_with_dataset_expression(self, url_safe_serializer):
-        self._create_dag_model_for_details_endpoint_with_dataset_expression(self.dag_id)
+    def test_should_respond_200_with_asset_expression(self, url_safe_serializer):
+        self._create_dag_model_for_details_endpoint_with_asset_expression(self.dag_id)
         current_file_token = url_safe_serializer.dumps("/tmp/dag.py")
         response = self.client.get(
             f"/api/v1/dags/{self.dag_id}/details", environ_overrides={"REMOTE_USER": "test"}
@@ -358,7 +358,7 @@ def test_should_respond_200_with_dataset_expression(self, url_safe_serializer):
             "dag_id": "test_dag",
             "dag_display_name": "test_dag",
             "dag_run_timeout": None,
-            "dataset_expression": {
+            "asset_expression": {
                 "any": [
                     "s3://dag1/output_1.txt",
                     {"all": ["s3://dag2/output_1.txt", "s3://dag3/output_3.txt"]},
@@ -421,7 +421,7 @@ def test_should_response_200_with_doc_md_none(self, url_safe_serializer):
             "dag_id": "test_dag2",
             "dag_display_name": "test_dag2",
             "dag_run_timeout": None,
-            "dataset_expression": None,
+            "asset_expression": None,
             "default_view": None,
             "description": None,
             "doc_md": None,
@@ -472,7 +472,7 @@ def test_should_response_200_for_null_start_date(self, url_safe_serializer):
             "dag_id": "test_dag3",
             "dag_display_name": "test_dag3",
             "dag_run_timeout": None,
-            "dataset_expression": None,
+            "asset_expression": None,
             "default_view": None,
             "description": None,
             "doc_md": None,
@@ -526,7 +526,7 @@ def test_should_respond_200_serialized(self, url_safe_serializer):
             "dag_id": "test_dag",
             "dag_display_name": "test_dag",
             "dag_run_timeout": None,
-            "dataset_expression": None,
+            "asset_expression": None,
             "default_view": None,
             "description": None,
             "doc_md": "details",
@@ -587,7 +587,7 @@ def test_should_respond_200_serialized(self, url_safe_serializer):
             "dag_id": "test_dag",
             "dag_display_name": "test_dag",
             "dag_run_timeout": None,
-            "dataset_expression": None,
+            "asset_expression": None,
             "default_view": None,
             "description": None,
             "doc_md": "details",
diff --git a/tests/api_connexion/endpoints/test_dag_parsing.py b/tests/api_connexion/endpoints/test_dag_parsing.py
index ce41b9b3b4251..e12d521c27242 100644
--- a/tests/api_connexion/endpoints/test_dag_parsing.py
+++ b/tests/api_connexion/endpoints/test_dag_parsing.py
@@ -38,7 +38,7 @@
 EXAMPLE_DAG_ID = "example_bash_operator"
 TEST_DAG_ID = "latest_only"
 NOT_READABLE_DAG_ID = "latest_only_with_trigger"
-TEST_MULTIPLE_DAGS_ID = "dataset_produces_1"
+TEST_MULTIPLE_DAGS_ID = "asset_produces_1"
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/api_connexion/endpoints/test_dag_run_endpoint.py b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
index 537ae55ebee8a..c42d9b4c7f7f7 100644
--- a/tests/api_connexion/endpoints/test_dag_run_endpoint.py
+++ b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
@@ -1783,7 +1783,7 @@ def test_should_respond_200(self, dag_maker, session):
 
         asset1_id = session.query(AssetModel.id).filter_by(uri=asset1.uri).scalar()
         event = AssetEvent(
-            dataset_id=asset1_id,
+            asset_id=asset1_id,
             source_task_id=ti.task_id,
             source_dag_id=ti.dag_id,
             source_run_id=ti.run_id,
@@ -1793,8 +1793,8 @@ def test_should_respond_200(self, dag_maker, session):
 
         with dag_maker(dag_id="TEST_DAG_ID", start_date=timezone.utcnow(), session=session):
             pass
-        dr = dag_maker.create_dagrun(run_id="TEST_DAG_RUN_ID", run_type=DagRunType.DATASET_TRIGGERED)
-        dr.consumed_dataset_events.append(event)
+        dr = dag_maker.create_dagrun(run_id="TEST_DAG_RUN_ID", run_type=DagRunType.ASSET_TRIGGERED)
+        dr.consumed_asset_events.append(event)
 
         session.commit()
         assert event.timestamp
@@ -1808,8 +1808,8 @@ def test_should_respond_200(self, dag_maker, session):
             "asset_events": [
                 {
                     "timestamp": event.timestamp.isoformat(),
-                    "dataset_id": asset1_id,
-                    "dataset_uri": asset1.uri,
+                    "asset_id": asset1_id,
+                    "asset_uri": asset1.uri,
                     "extra": {},
                     "id": event.id,
                     "source_dag_id": ti.dag_id,
diff --git a/tests/api_connexion/schemas/test_dataset_schema.py b/tests/api_connexion/schemas/test_dataset_schema.py
index 1f5140b076b10..cbbc427a89709 100644
--- a/tests/api_connexion/schemas/test_dataset_schema.py
+++ b/tests/api_connexion/schemas/test_dataset_schema.py
@@ -52,18 +52,18 @@ def teardown_method(self) -> None:
 
 class TestAssetSchema(TestAssetSchemaBase):
     def test_serialize(self, dag_maker, session):
-        dataset = Asset(
+        asset = Asset(
             uri="s3://bucket/key",
             extra={"foo": "bar"},
         )
-        with dag_maker(dag_id="test_dataset_upstream_schema", serialized=True, session=session):
-            EmptyOperator(task_id="task1", outlets=[dataset])
+        with dag_maker(dag_id="test_asset_upstream_schema", serialized=True, session=session):
+            EmptyOperator(task_id="task1", outlets=[asset])
         with dag_maker(
-            dag_id="test_dataset_downstream_schema", schedule=[dataset], serialized=True, session=session
+            dag_id="test_asset_downstream_schema", schedule=[asset], serialized=True, session=session
         ):
             EmptyOperator(task_id="task2")
 
-        asset_model = session.query(AssetModel).filter_by(uri=dataset.uri).one()
+        asset_model = session.query(AssetModel).filter_by(uri=asset.uri).one()
 
         serialized_data = asset_schema.dump(asset_model)
         serialized_data["id"] = 1
@@ -75,7 +75,7 @@ def test_serialize(self, dag_maker, session):
             "updated_at": self.timestamp,
             "consuming_dags": [
                 {
-                    "dag_id": "test_dataset_downstream_schema",
+                    "dag_id": "test_asset_downstream_schema",
                     "created_at": self.timestamp,
                     "updated_at": self.timestamp,
                 }
@@ -83,7 +83,7 @@ def test_serialize(self, dag_maker, session):
             "producing_tasks": [
                 {
                     "task_id": "task1",
-                    "dag_id": "test_dataset_upstream_schema",
+                    "dag_id": "test_asset_upstream_schema",
                     "created_at": self.timestamp,
                     "updated_at": self.timestamp,
                 }
@@ -103,7 +103,7 @@ def test_serialize(self, session):
         ]
         asset_aliases = [AssetAliasModel(name=f"alias_{i}") for i in range(2)]
         for asset_alias in asset_aliases:
-            asset_alias.datasets.append(assets[0])
+            asset_alias.assets.append(assets[0])
         session.add_all(assets)
         session.add_all(asset_aliases)
         session.flush()
@@ -149,7 +149,7 @@ def test_serialize(self, session):
         session.commit()
         event = AssetEvent(
             id=1,
-            dataset_id=assetssetsset.id,
+            asset_id=assetssetsset.id,
             extra={"foo": "bar"},
             source_dag_id="foo",
             source_task_id="bar",
@@ -161,8 +161,8 @@ def test_serialize(self, session):
         serialized_data = asset_event_schema.dump(event)
         assert serialized_data == {
             "id": 1,
-            "dataset_id": assetssetsset.id,
-            "dataset_uri": "s3://abc",
+            "asset_id": assetssetsset.id,
+            "asset_uri": "s3://abc",
             "extra": {"foo": "bar"},
             "source_dag_id": "foo",
             "source_task_id": "bar",
@@ -180,7 +180,7 @@ def test_serialize(self, session):
         session.commit()
         event = AssetEvent(
             id=1,
-            dataset_id=asset.id,
+            asset_id=asset.id,
             extra={"foo": "bar"},
             source_dag_id=None,
             source_task_id=None,
@@ -192,8 +192,8 @@ def test_serialize(self, session):
         serialized_data = asset_event_schema.dump(event)
         assert serialized_data == {
             "id": 1,
-            "dataset_id": asset.id,
-            "dataset_uri": "s3://abc",
+            "asset_id": asset.id,
+            "asset_uri": "s3://abc",
             "extra": {"foo": "bar"},
             "source_dag_id": None,
             "source_task_id": None,
@@ -207,7 +207,7 @@ def test_serialize(self, session):
 class TestAssetEventCollectionSchema(TestAssetSchemaBase):
     def test_serialize(self, session):
         common = {
-            "dataset_id": 10,
+            "asset_id": 10,
             "extra": {"foo": "bar"},
             "source_dag_id": "foo",
             "source_task_id": "bar",
diff --git a/tests/api_fastapi/core_api/routes/public/test_dag_run.py b/tests/api_fastapi/core_api/routes/public/test_dag_run.py
index 3c665d5e18daf..badb32404b37a 100644
--- a/tests/api_fastapi/core_api/routes/public/test_dag_run.py
+++ b/tests/api_fastapi/core_api/routes/public/test_dag_run.py
@@ -43,7 +43,7 @@
 DAG1_RUN1_RUN_TYPE = DagRunType.MANUAL
 DAG1_RUN2_RUN_TYPE = DagRunType.SCHEDULED
 DAG2_RUN1_RUN_TYPE = DagRunType.BACKFILL_JOB
-DAG2_RUN2_RUN_TYPE = DagRunType.DATASET_TRIGGERED
+DAG2_RUN2_RUN_TYPE = DagRunType.ASSET_TRIGGERED
 DAG1_RUN1_TRIGGERED_BY = DagRunTriggeredByType.UI
 DAG1_RUN2_TRIGGERED_BY = DagRunTriggeredByType.DATASET
 DAG2_RUN1_TRIGGERED_BY = DagRunTriggeredByType.CLI
diff --git a/tests/api_fastapi/core_api/routes/public/test_dags.py b/tests/api_fastapi/core_api/routes/public/test_dags.py
index a48040482023e..0d3b8abbdec8c 100644
--- a/tests/api_fastapi/core_api/routes/public/test_dags.py
+++ b/tests/api_fastapi/core_api/routes/public/test_dags.py
@@ -290,12 +290,12 @@ def test_dag_details(
         last_parsed_time = res_json["last_parsed_time"]
         file_token = res_json["file_token"]
         expected = {
+            "asset_expression": None,
             "catchup": True,
             "concurrency": 16,
             "dag_id": dag_id,
             "dag_display_name": dag_display_name,
             "dag_run_timeout": None,
-            "dataset_expression": None,
             "default_view": "grid",
             "description": None,
             "doc_md": "details",
diff --git a/tests/api_fastapi/core_api/routes/ui/test_assets.py b/tests/api_fastapi/core_api/routes/ui/test_assets.py
index 7662ff5a02fa8..b71d80ae9d31b 100644
--- a/tests/api_fastapi/core_api/routes/ui/test_assets.py
+++ b/tests/api_fastapi/core_api/routes/ui/test_assets.py
@@ -46,6 +46,6 @@ def test_next_run_assets(test_client, dag_maker):
 
     assert response.status_code == 200
     assert response.json() == {
-        "dataset_expression": {"all": ["s3://bucket/key/1"]},
+        "asset_expression": {"all": ["s3://bucket/key/1"]},
         "events": [{"id": 17, "uri": "s3://bucket/key/1", "lastUpdate": None}],
     }
diff --git a/tests/api_fastapi/core_api/routes/ui/test_dashboard.py b/tests/api_fastapi/core_api/routes/ui/test_dashboard.py
index 8ad9da12ac8bf..e96a316065496 100644
--- a/tests/api_fastapi/core_api/routes/ui/test_dashboard.py
+++ b/tests/api_fastapi/core_api/routes/ui/test_dashboard.py
@@ -75,7 +75,7 @@ def make_dag_runs(dag_maker, session, time_machine):
     run2 = dag_maker.create_dagrun(
         run_id="run_2",
         state=DagRunState.FAILED,
-        run_type=DagRunType.DATASET_TRIGGERED,
+        run_type=DagRunType.ASSET_TRIGGERED,
         execution_date=date + timedelta(days=1),
         start_date=date + timedelta(days=1),
     )
@@ -108,7 +108,7 @@ def test_historical_metrics_data(self, test_client, time_machine):
         assert response.status_code == 200
         assert response.json() == {
             "dag_run_states": {"failed": 1, "queued": 0, "running": 1, "success": 1},
-            "dag_run_types": {"backfill": 0, "dataset_triggered": 1, "manual": 0, "scheduled": 2},
+            "dag_run_types": {"backfill": 0, "asset_triggered": 1, "manual": 0, "scheduled": 2},
             "task_instance_states": {
                 "deferred": 0,
                 "failed": 2,
@@ -133,7 +133,7 @@ def test_historical_metrics_data_date_filters(self, test_client):
         assert response.status_code == 200
         assert response.json() == {
             "dag_run_states": {"failed": 1, "queued": 0, "running": 0, "success": 0},
-            "dag_run_types": {"backfill": 0, "dataset_triggered": 1, "manual": 0, "scheduled": 0},
+            "dag_run_types": {"backfill": 0, "asset_triggered": 1, "manual": 0, "scheduled": 0},
             "task_instance_states": {
                 "deferred": 0,
                 "failed": 2,
diff --git a/tests/assets/test_asset.py b/tests/assets/test_asset.py
index 4d3466b90c13d..9243fd59857f1 100644
--- a/tests/assets/test_asset.py
+++ b/tests/assets/test_asset.py
@@ -343,14 +343,14 @@ def test_asset_dag_run_queue_processing(session, clear_assets, dag_maker, create
 
     # Add AssetDagRunQueue entries to simulate asset event processing
     for am in asset_models:
-        session.add(AssetDagRunQueue(dataset_id=am.id, target_dag_id=dag.dag_id))
+        session.add(AssetDagRunQueue(asset_id=am.id, target_dag_id=dag.dag_id))
     session.commit()
 
     # Fetch and evaluate asset triggers for all DAGs affected by asset events
     records = session.scalars(select(AssetDagRunQueue)).all()
     dag_statuses = defaultdict(lambda: defaultdict(bool))
     for record in records:
-        dag_statuses[record.target_dag_id][record.dataset.uri] = True
+        dag_statuses[record.target_dag_id][record.asset.uri] = True
 
     serialized_dags = session.execute(
         select(SerializedDagModel).where(SerializedDagModel.dag_id.in_(dag_statuses.keys()))
@@ -587,7 +587,7 @@ def resolved_asset_alias_2(self, session, asset_1):
         """Example asset alias links to asset asset_alias_1."""
         asset_name = "test_name_2"
         asset_alias_2 = AssetAliasModel(name=asset_name)
-        asset_alias_2.datasets.append(asset_1)
+        asset_alias_2.assets.append(asset_1)
 
         session.add(asset_alias_2)
         session.commit()
diff --git a/tests/assets/test_manager.py b/tests/assets/test_manager.py
index f2dcc88b8338b..6b9e5623608da 100644
--- a/tests/assets/test_manager.py
+++ b/tests/assets/test_manager.py
@@ -144,7 +144,7 @@ def test_register_asset_change(self, session, dag_maker, mock_task_instance):
         session.flush()
 
         # Ensure we've created an asset
-        assert session.query(AssetEvent).filter_by(dataset_id=asm.id).count() == 1
+        assert session.query(AssetEvent).filter_by(asset_id=asm.id).count() == 1
         assert session.query(AssetDagRunQueue).count() == 2
 
     @pytest.mark.usefixtures("clear_assets")
@@ -178,7 +178,7 @@ def test_register_asset_change_with_alias(self, session, dag_maker, mock_task_in
         session.flush()
 
         # Ensure we've created an asset
-        assert session.query(AssetEvent).filter_by(dataset_id=asm.id).count() == 1
+        assert session.query(AssetEvent).filter_by(asset_id=asm.id).count() == 1
         assert session.query(AssetDagRunQueue).count() == 2
         assert session.query(DagPriorityParsingRequest).count() == 2
 
@@ -195,7 +195,7 @@ def test_register_asset_change_no_downstreams(self, session, mock_task_instance)
         session.flush()
 
         # Ensure we've created an asset
-        assert session.query(AssetEvent).filter_by(dataset_id=asm.id).count() == 1
+        assert session.query(AssetEvent).filter_by(asset_id=asm.id).count() == 1
         assert session.query(AssetDagRunQueue).count() == 0
 
     @pytest.mark.skip_if_database_isolation_mode
diff --git a/tests/dags/test_assets.py b/tests/dags/test_assets.py
index 014ae6fd0ca9f..2f2917dd66934 100644
--- a/tests/dags/test_assets.py
+++ b/tests/dags/test_assets.py
@@ -25,8 +25,8 @@
 from airflow.operators.python import PythonOperator
 from airflow.providers.standard.operators.bash import BashOperator
 
-skip_task_dag_dataset = Asset("s3://dag_with_skip_task/output_1.txt", extra={"hi": "bye"})
-fail_task_dag_dataset = Asset("s3://dag_with_fail_task/output_1.txt", extra={"hi": "bye"})
+skip_task_dag_asset = Asset("s3://dag_with_skip_task/output_1.txt", extra={"hi": "bye"})
+fail_task_dag_asset = Asset("s3://dag_with_fail_task/output_1.txt", extra={"hi": "bye"})
 
 
 def raise_skip_exc():
@@ -42,7 +42,7 @@ def raise_skip_exc():
 )
 PythonOperator(
     task_id="skip_task",
-    outlets=[skip_task_dag_dataset],
+    outlets=[skip_task_dag_asset],
     python_callable=raise_skip_exc,
     dag=dag_with_skip_task,
 )
@@ -51,7 +51,7 @@ def raise_skip_exc():
     dag_id="dag_that_follows_dag_with_skip",
     catchup=False,
     start_date=datetime(2020, 1, 1),
-    schedule=[skip_task_dag_dataset],
+    schedule=[skip_task_dag_asset],
     tags=["downstream-skipped"],
 ) as dag_that_follows_dag_with_skip:
     BashOperator(
@@ -73,7 +73,7 @@ def raise_fail_exc():
 )
 PythonOperator(
     task_id="fail_task",
-    outlets=[fail_task_dag_dataset],
+    outlets=[fail_task_dag_asset],
     python_callable=raise_fail_exc,
     dag=dag_with_fail_task,
 )
@@ -82,7 +82,7 @@ def raise_fail_exc():
     dag_id="dag_that_follows_dag_with_fail",
     catchup=False,
     start_date=datetime(2020, 1, 1),
-    schedule=[fail_task_dag_dataset],
+    schedule=[fail_task_dag_asset],
     tags=["downstream-failed"],
 ) as dag_that_follows_dag_with_fail:
     BashOperator(
diff --git a/tests/jobs/test_scheduler_job.py b/tests/jobs/test_scheduler_job.py
index 17fd851714bb5..ac48344435a3b 100644
--- a/tests/jobs/test_scheduler_job.py
+++ b/tests/jobs/test_scheduler_job.py
@@ -3939,7 +3939,13 @@ def test_should_update_dag_next_dagruns(self, provide_run_count: bool, kwargs: d
             (DagRunType.MANUAL, False),
             (DagRunType.SCHEDULED, True),
             (DagRunType.BACKFILL_JOB, True),
-            (DagRunType.DATASET_TRIGGERED, False),
+            (DagRunType.ASSET_TRIGGERED, False),
+        ],
+        ids=[
+            DagRunType.MANUAL.name,
+            DagRunType.SCHEDULED.name,
+            DagRunType.BACKFILL_JOB.name,
+            DagRunType.ASSET_TRIGGERED.name,
         ],
     )
     def test_should_update_dag_next_dagruns_after_run_type(self, run_type, expected, session, dag_maker):
@@ -4025,7 +4031,7 @@ def test_create_dag_runs_assets(self, session, dag_maker):
         asset1_id = session.query(AssetModel.id).filter_by(uri=asset1.uri).scalar()
 
         event1 = AssetEvent(
-            dataset_id=asset1_id,
+            asset_id=asset1_id,
             source_task_id="task",
             source_dag_id=dr.dag_id,
             source_run_id=dr.run_id,
@@ -4041,7 +4047,7 @@ def test_create_dag_runs_assets(self, session, dag_maker):
         )
 
         event2 = AssetEvent(
-            dataset_id=asset1_id,
+            asset_id=asset1_id,
             source_task_id="task",
             source_dag_id=dr.dag_id,
             source_run_id=dr.run_id,
@@ -4059,8 +4065,8 @@ def test_create_dag_runs_assets(self, session, dag_maker):
         session = dag_maker.session
         session.add_all(
             [
-                AssetDagRunQueue(dataset_id=asset1_id, target_dag_id=dag2.dag_id),
-                AssetDagRunQueue(dataset_id=asset1_id, target_dag_id=dag3.dag_id),
+                AssetDagRunQueue(asset_id=asset1_id, target_dag_id=dag2.dag_id),
+                AssetDagRunQueue(asset_id=asset1_id, target_dag_id=dag3.dag_id),
             ]
         )
         session.flush()
@@ -4084,7 +4090,7 @@ def dict_from_obj(obj):
 
         # we don't have __eq__ defined on AssetEvent because... given the fact that in the future
         # we may register events from other systems, asset_id + timestamp might not be enough PK
-        assert list(map(dict_from_obj, created_run.consumed_dataset_events)) == list(
+        assert list(map(dict_from_obj, created_run.consumed_asset_events)) == list(
             map(dict_from_obj, [event1, event2])
         )
         assert created_run.data_interval_start == DEFAULT_DATE + timedelta(days=5)
@@ -4116,9 +4122,9 @@ def test_no_create_dag_runs_when_dag_disabled(self, session, dag_maker, disable,
 
         asset_id = session.scalars(select(AssetModel.id).filter_by(uri=ds.uri)).one()
 
-        ase_q = select(AssetEvent).where(AssetEvent.dataset_id == asset_id).order_by(AssetEvent.timestamp)
+        ase_q = select(AssetEvent).where(AssetEvent.asset_id == asset_id).order_by(AssetEvent.timestamp)
         adrq_q = select(AssetDagRunQueue).where(
-            AssetDagRunQueue.dataset_id == asset_id, AssetDagRunQueue.target_dag_id == "consumer"
+            AssetDagRunQueue.asset_id == asset_id, AssetDagRunQueue.target_dag_id == "consumer"
         )
 
         # Simulate the consumer DAG being disabled.
diff --git a/tests/models/test_dag.py b/tests/models/test_dag.py
index 61b4628175200..c1f03b3d7a548 100644
--- a/tests/models/test_dag.py
+++ b/tests/models/test_dag.py
@@ -1035,7 +1035,7 @@ def test_bulk_write_to_db_assets(self):
             session.query(
                 TaskOutletAssetReference.task_id,
                 TaskOutletAssetReference.dag_id,
-                TaskOutletAssetReference.dataset_id,
+                TaskOutletAssetReference.asset_id,
             )
             .filter(TaskOutletAssetReference.dag_id.in_((dag_id1, dag_id2)))
             .all()
@@ -1064,7 +1064,7 @@ def test_bulk_write_to_db_assets(self):
             session.query(
                 TaskOutletAssetReference.task_id,
                 TaskOutletAssetReference.dag_id,
-                TaskOutletAssetReference.dataset_id,
+                TaskOutletAssetReference.asset_id,
             )
             .filter(TaskOutletAssetReference.dag_id.in_((dag_id1, dag_id2)))
             .all()
@@ -2451,8 +2451,8 @@ def test_dags_needing_dagruns_assets(self, dag_maker, session):
 
         # add queue records so we'll need a run
         dag_model = session.query(DagModel).filter(DagModel.dag_id == dag.dag_id).one()
-        asset_model: AssetModel = dag_model.schedule_datasets[0]
-        session.add(AssetDagRunQueue(dataset_id=asset_model.id, target_dag_id=dag_model.dag_id))
+        asset_model: AssetModel = dag_model.schedule_assets[0]
+        session.add(AssetDagRunQueue(asset_id=asset_model.id, target_dag_id=dag_model.dag_id))
         session.flush()
         query, _ = DagModel.dags_needing_dagruns(session)
         dag_models = query.all()
@@ -2460,7 +2460,7 @@ def test_dags_needing_dagruns_assets(self, dag_maker, session):
 
         # create run so we don't need a run anymore (due to max active runs)
         dag_maker.create_dagrun(
-            run_type=DagRunType.DATASET_TRIGGERED,
+            run_type=DagRunType.ASSET_TRIGGERED,
             state=DagRunState.QUEUED,
             execution_date=pendulum.now("UTC"),
         )
@@ -2479,7 +2479,7 @@ def test_dags_needing_dagruns_asset_aliases(self, dag_maker, session):
         # link asset_alias hello_alias to asset hello
         asset_model = AssetModel(uri="hello")
         asset_alias_model = AssetAliasModel(name="hello_alias")
-        asset_alias_model.datasets.append(asset_model)
+        asset_alias_model.assets.append(asset_model)
         session.add_all([asset_model, asset_alias_model])
         session.commit()
 
@@ -2499,8 +2499,8 @@ def test_dags_needing_dagruns_asset_aliases(self, dag_maker, session):
 
         # add queue records so we'll need a run
         dag_model = dag_maker.dag_model
-        asset_model: AssetModel = dag_model.schedule_datasets[0]
-        session.add(AssetDagRunQueue(dataset_id=asset_model.id, target_dag_id=dag_model.dag_id))
+        asset_model: AssetModel = dag_model.schedule_assets[0]
+        session.add(AssetDagRunQueue(asset_id=asset_model.id, target_dag_id=dag_model.dag_id))
         session.flush()
         query, _ = DagModel.dags_needing_dagruns(session)
         dag_models = query.all()
@@ -2508,7 +2508,7 @@ def test_dags_needing_dagruns_asset_aliases(self, dag_maker, session):
 
         # create run so we don't need a run anymore (due to max active runs)
         dag_maker.create_dagrun(
-            run_type=DagRunType.DATASET_TRIGGERED,
+            run_type=DagRunType.ASSET_TRIGGERED,
             state=DagRunState.QUEUED,
             execution_date=pendulum.now("UTC"),
         )
@@ -2677,7 +2677,7 @@ def test_dags_needing_dagruns_asset_triggered_dag_info_queued_times(self, sessio
 
             session.add(
                 AssetEvent(
-                    dataset_id=asset_id,
+                    asset_id=asset_id,
                     source_task_id="task",
                     source_dag_id=dr.dag_id,
                     source_run_id=dr.run_id,
@@ -2694,9 +2694,9 @@ def test_dags_needing_dagruns_asset_triggered_dag_info_queued_times(self, sessio
         session.flush()
         session.add_all(
             [
-                AssetDagRunQueue(dataset_id=asset1_id, target_dag_id=dag.dag_id, created_at=DEFAULT_DATE),
+                AssetDagRunQueue(asset_id=asset1_id, target_dag_id=dag.dag_id, created_at=DEFAULT_DATE),
                 AssetDagRunQueue(
-                    dataset_id=asset2_id,
+                    asset_id=asset2_id,
                     target_dag_id=dag.dag_id,
                     created_at=DEFAULT_DATE + timedelta(hours=1),
                 ),
@@ -2704,10 +2704,10 @@ def test_dags_needing_dagruns_asset_triggered_dag_info_queued_times(self, sessio
         )
         session.flush()
 
-        query, dataset_triggered_dag_info = DagModel.dags_needing_dagruns(session)
-        assert 1 == len(dataset_triggered_dag_info)
-        assert dag.dag_id in dataset_triggered_dag_info
-        first_queued_time, last_queued_time = dataset_triggered_dag_info[dag.dag_id]
+        query, asset_triggered_dag_info = DagModel.dags_needing_dagruns(session)
+        assert 1 == len(asset_triggered_dag_info)
+        assert dag.dag_id in asset_triggered_dag_info
+        first_queued_time, last_queued_time = asset_triggered_dag_info[dag.dag_id]
         assert first_queued_time == DEFAULT_DATE
         assert last_queued_time == DEFAULT_DATE + timedelta(hours=1)
 
@@ -2726,7 +2726,7 @@ def test_asset_expression(self, session: Session) -> None:
         )
         DAG.bulk_write_to_db([dag], session=session)
 
-        expression = session.scalars(select(DagModel.dataset_expression).filter_by(dag_id=dag.dag_id)).one()
+        expression = session.scalars(select(DagModel.asset_expression).filter_by(dag_id=dag.dag_id)).one()
         assert expression == {
             "any": [
                 "s3://dag1/output_1.txt",
@@ -3433,8 +3433,8 @@ def test_get_asset_triggered_next_run_info(dag_maker, clear_assets):
     asset1_id = session.query(AssetModel.id).filter_by(uri=asset1.uri).scalar()
     session.bulk_save_objects(
         [
-            AssetDagRunQueue(dataset_id=asset1_id, target_dag_id=dag2.dag_id),
-            AssetDagRunQueue(dataset_id=asset1_id, target_dag_id=dag3.dag_id),
+            AssetDagRunQueue(asset_id=asset1_id, target_dag_id=dag2.dag_id),
+            AssetDagRunQueue(asset_id=asset1_id, target_dag_id=dag3.dag_id),
         ]
     )
     session.flush()
@@ -3463,9 +3463,9 @@ def test_get_asset_triggered_next_run_info(dag_maker, clear_assets):
 
 
 @pytest.mark.need_serialized_dag
-def test_get_dataset_triggered_next_run_info_with_unresolved_dataset_alias(dag_maker, clear_assets):
-    dataset_alias1 = AssetAlias(name="alias")
-    with dag_maker(dag_id="dag-1", schedule=[dataset_alias1]):
+def test_get_asset_triggered_next_run_info_with_unresolved_asset_alias(dag_maker, clear_assets):
+    asset_alias1 = AssetAlias(name="alias")
+    with dag_maker(dag_id="dag-1", schedule=[asset_alias1]):
         pass
     dag1 = dag_maker.dag
     session = dag_maker.session
@@ -3499,7 +3499,7 @@ def generate_run_id(self, *, run_type, logical_date, data_interval, **extra) ->
 
 @pytest.mark.parametrize(
     "run_id_type",
-    [DagRunType.BACKFILL_JOB, DagRunType.SCHEDULED, DagRunType.DATASET_TRIGGERED],
+    [DagRunType.BACKFILL_JOB, DagRunType.SCHEDULED, DagRunType.ASSET_TRIGGERED],
 )
 def test_create_dagrun_disallow_manual_to_use_automated_run_id(run_id_type: DagRunType) -> None:
     dag = DAG(dag_id="test", start_date=DEFAULT_DATE, schedule="@daily")
diff --git a/tests/models/test_dagrun.py b/tests/models/test_dagrun.py
index d779276b2b90a..4f788a2dccc6d 100644
--- a/tests/models/test_dagrun.py
+++ b/tests/models/test_dagrun.py
@@ -2809,13 +2809,13 @@ def make_task(task_id, dag):
         # run_ids
         ["", "scheduled__2023-01-01T00:00:00+00:00", True],
         ["", "manual__2023-01-01T00:00:00+00:00", True],
-        ["", "dataset_triggered__2023-01-01T00:00:00+00:00", True],
+        ["", "asset_triggered__2023-01-01T00:00:00+00:00", True],
         ["", "scheduled_2023-01-01T00", False],
         ["", "manual_2023-01-01T00", False],
-        ["", "dataset_triggered_2023-01-01T00", False],
+        ["", "asset_triggered_2023-01-01T00", False],
         ["^[0-9]", "scheduled__2023-01-01T00:00:00+00:00", True],
         ["^[0-9]", "manual__2023-01-01T00:00:00+00:00", True],
-        ["^[a-z]", "dataset_triggered__2023-01-01T00:00:00+00:00", True],
+        ["^[a-z]", "asset_triggered__2023-01-01T00:00:00+00:00", True],
     ],
 )
 def test_dag_run_id_config(session, dag_maker, pattern, run_id, result):
diff --git a/tests/models/test_taskinstance.py b/tests/models/test_taskinstance.py
index 53d8feceff1e1..d864d7f475e90 100644
--- a/tests/models/test_taskinstance.py
+++ b/tests/models/test_taskinstance.py
@@ -2297,15 +2297,15 @@ def test_outlet_assets(self, create_task_instance):
         # check that no other asset events recorded
         event = (
             session.query(AssetEvent)
-            .join(AssetEvent.dataset)
+            .join(AssetEvent.asset)
             .filter(AssetEvent.source_task_instance == ti)
             .one()
         )
         assert event
-        assert event.dataset
+        assert event.asset
 
         # check that one queue record created for each dag that depends on asset 1
-        assert session.query(AssetDagRunQueue.target_dag_id).filter_by(dataset_id=event.dataset.id).order_by(
+        assert session.query(AssetDagRunQueue.target_dag_id).filter_by(asset_id=event.asset.id).order_by(
             AssetDagRunQueue.target_dag_id
         ).all() == [
             ("asset_consumes_1",),
@@ -2318,14 +2318,12 @@ def test_outlet_assets(self, create_task_instance):
         ]
 
         # check that one event record created for asset1 and this TI
-        assert session.query(AssetModel.uri).join(AssetEvent.dataset).filter(
+        assert session.query(AssetModel.uri).join(AssetEvent.asset).filter(
             AssetEvent.source_task_instance == ti
         ).one() == ("s3://dag1/output_1.txt",)
 
         # check that the asset event has an earlier timestamp than the ADRQ's
-        adrq_timestamps = (
-            session.query(AssetDagRunQueue.created_at).filter_by(dataset_id=event.dataset.id).all()
-        )
+        adrq_timestamps = session.query(AssetDagRunQueue.created_at).filter_by(asset_id=event.asset.id).all()
         assert all(
             event.timestamp < adrq_timestamp for (adrq_timestamp,) in adrq_timestamps
         ), f"Some items in {[str(t) for t in adrq_timestamps]} are earlier than {event.timestamp}"
@@ -2450,13 +2448,13 @@ def _write2_post_execute(context, _):
         assert events["write1"].source_dag_id == dr.dag_id
         assert events["write1"].source_run_id == dr.run_id
         assert events["write1"].source_task_id == "write1"
-        assert events["write1"].dataset.uri == "test_outlet_asset_extra_1"
+        assert events["write1"].asset.uri == "test_outlet_asset_extra_1"
         assert events["write1"].extra == {"foo": "bar"}
 
         assert events["write2"].source_dag_id == dr.dag_id
         assert events["write2"].source_run_id == dr.run_id
         assert events["write2"].source_task_id == "write2"
-        assert events["write2"].dataset.uri == "test_outlet_asset_extra_2"
+        assert events["write2"].asset.uri == "test_outlet_asset_extra_2"
         assert events["write2"].extra == {"x": 1}
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
@@ -2522,13 +2520,13 @@ def _write2_post_execute(context, result):
         assert events["write1"].source_dag_id == dr.dag_id
         assert events["write1"].source_run_id == dr.run_id
         assert events["write1"].source_task_id == "write1"
-        assert events["write1"].dataset.uri == "test_outlet_asset_extra_1"
+        assert events["write1"].asset.uri == "test_outlet_asset_extra_1"
         assert events["write1"].extra == {"foo": "bar"}
 
         assert events["write2"].source_dag_id == dr.dag_id
         assert events["write2"].source_run_id == dr.run_id
         assert events["write2"].source_task_id == "write2"
-        assert events["write2"].dataset.uri == "test_outlet_asset_extra_2"
+        assert events["write2"].asset.uri == "test_outlet_asset_extra_2"
         assert events["write2"].extra == {"x": 1}
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
@@ -2567,7 +2565,7 @@ def producer(*, outlet_events):
         assert producer_event.source_dag_id == "producer_dag"
         assert producer_event.source_run_id == "test"
         assert producer_event.source_map_index == -1
-        assert producer_event.dataset.uri == asset_uri
+        assert producer_event.asset.uri == asset_uri
         assert len(producer_event.source_aliases) == 1
         assert producer_event.extra == {}
         assert producer_event.source_aliases[0].name == alias_name_1
@@ -2577,8 +2575,8 @@ def producer(*, outlet_events):
         assert asset_obj.aliases[0].name == alias_name_1
 
         asset_alias_obj = session.scalar(select(AssetAliasModel).where(AssetAliasModel.name == alias_name_1))
-        assert len(asset_alias_obj.datasets) == 1
-        assert asset_alias_obj.datasets[0].uri == asset_uri
+        assert len(asset_alias_obj.assets) == 1
+        assert asset_alias_obj.assets[0].uri == asset_uri
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
     def test_outlet_multiple_asset_alias(self, dag_maker, session):
@@ -2626,7 +2624,7 @@ def producer(*, outlet_events):
             assert producer_event.source_dag_id == "producer_dag"
             assert producer_event.source_run_id == "test"
             assert producer_event.source_map_index == -1
-            assert producer_event.dataset.uri == asset_uri
+            assert producer_event.asset.uri == asset_uri
 
             if not producer_event.extra:
                 assert producer_event.extra == {}
@@ -2651,8 +2649,8 @@ def producer(*, outlet_events):
         asset_alias_objs = session.scalars(select(AssetAliasModel)).all()
         assert len(asset_alias_objs) == 3
         for asset_alias_obj in asset_alias_objs:
-            assert len(asset_alias_obj.datasets) == 1
-            assert asset_alias_obj.datasets[0].uri == asset_uri
+            assert len(asset_alias_obj.assets) == 1
+            assert asset_alias_obj.assets[0].uri == asset_uri
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
     def test_outlet_asset_alias_through_metadata(self, dag_maker, session):
@@ -2686,7 +2684,7 @@ def producer(*, outlet_events):
         assert producer_event.source_dag_id == "producer_dag"
         assert producer_event.source_run_id == "test"
         assert producer_event.source_map_index == -1
-        assert producer_event.dataset.uri == asset_uri
+        assert producer_event.asset.uri == asset_uri
         assert producer_event.extra == {"key": "value"}
         assert len(producer_event.source_aliases) == 1
         assert producer_event.source_aliases[0].name == asset_alias_name
@@ -2696,8 +2694,8 @@ def producer(*, outlet_events):
         assert asset_obj.aliases[0].name == asset_alias_name
 
         asset_alias_obj = session.scalar(select(AssetAliasModel))
-        assert len(asset_alias_obj.datasets) == 1
-        assert asset_alias_obj.datasets[0].uri == asset_uri
+        assert len(asset_alias_obj.assets) == 1
+        assert asset_alias_obj.assets[0].uri == asset_uri
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
     def test_outlet_asset_alias_asset_not_exists(self, dag_maker, session):
@@ -2726,7 +2724,7 @@ def producer(*, outlet_events):
         assert producer_event.source_dag_id == "producer_dag"
         assert producer_event.source_run_id == "test"
         assert producer_event.source_map_index == -1
-        assert producer_event.dataset.uri == asset_uri
+        assert producer_event.asset.uri == asset_uri
         assert producer_event.extra == {"key": "value"}
         assert len(producer_event.source_aliases) == 1
         assert producer_event.source_aliases[0].name == asset_alias_name
@@ -2736,8 +2734,8 @@ def producer(*, outlet_events):
         assert asset_obj.aliases[0].name == asset_alias_name
 
         asset_alias_obj = session.scalar(select(AssetAliasModel))
-        assert len(asset_alias_obj.datasets) == 1
-        assert asset_alias_obj.datasets[0].uri == asset_uri
+        assert len(asset_alias_obj.assets) == 1
+        assert asset_alias_obj.assets[0].uri == asset_uri
 
     @pytest.mark.skip_if_database_isolation_mode  # Does not work in db isolation mode
     def test_inlet_asset_extra(self, dag_maker, session):
@@ -2800,7 +2798,7 @@ def test_inlet_asset_alias_extra(self, dag_maker, session):
 
         asset_model = AssetModel(id=1, uri=asset_uri)
         asset_alias_model = AssetAliasModel(name=asset_alias_name)
-        asset_alias_model.datasets.append(asset_model)
+        asset_alias_model.assets.append(asset_model)
         session.add_all([asset_model, asset_alias_model])
         session.commit()
 
@@ -2953,7 +2951,7 @@ def test_inlet_asset_alias_extra_slice(self, dag_maker, session, slicer, expecte
 
         asset_model = AssetModel(id=1, uri=asset_uri)
         asset_alias_model = AssetAliasModel(name=asset_alias_name)
-        asset_alias_model.datasets.append(asset_model)
+        asset_alias_model.assets.append(asset_model)
         session.add_all([asset_model, asset_alias_model])
         session.commit()
 
@@ -3196,19 +3194,19 @@ def test_context_triggering_asset_events(self, create_dummy_dag, session):
         )
         dr = dag.create_dagrun(
             run_id="test2",
-            run_type=DagRunType.DATASET_TRIGGERED,
+            run_type=DagRunType.ASSET_TRIGGERED,
             execution_date=execution_date,
             state=None,
             session=session,
             data_interval=(execution_date, execution_date),
             **triggered_by_kwargs,
         )
-        ds1_event = AssetEvent(dataset_id=1)
-        ds2_event_1 = AssetEvent(dataset_id=2)
-        ds2_event_2 = AssetEvent(dataset_id=2)
-        dr.consumed_dataset_events.append(ds1_event)
-        dr.consumed_dataset_events.append(ds2_event_1)
-        dr.consumed_dataset_events.append(ds2_event_2)
+        ds1_event = AssetEvent(asset_id=1)
+        ds2_event_1 = AssetEvent(asset_id=2)
+        ds2_event_2 = AssetEvent(asset_id=2)
+        dr.consumed_asset_events.append(ds1_event)
+        dr.consumed_asset_events.append(ds2_event_1)
+        dr.consumed_asset_events.append(ds2_event_2)
         session.commit()
 
         ti = dr.get_task_instance(task1.task_id, session=session)
diff --git a/tests/serialization/test_pydantic_models.py b/tests/serialization/test_pydantic_models.py
index ff17bfa9a5d5f..83d677df91b7f 100644
--- a/tests/serialization/test_pydantic_models.py
+++ b/tests/serialization/test_pydantic_models.py
@@ -222,7 +222,7 @@ def test_serializing_pydantic_local_task_job(session, create_task_instance):
 # This test should not be run in DB isolation mode as it accesses the database directly - deliberately
 @pytest.mark.skip_if_database_isolation_mode
 @pytest.mark.skipif(not _ENABLE_AIP_44, reason="AIP-44 is disabled")
-def test_serializing_pydantic_dataset_event(session, create_task_instance, create_dummy_dag):
+def test_serializing_pydantic_asset_event(session, create_task_instance, create_dummy_dag):
     ds1 = AssetModel(id=1, uri="one", extra={"foo": "bar"})
     ds2 = AssetModel(id=2, uri="two")
 
@@ -244,31 +244,31 @@ def test_serializing_pydantic_dataset_event(session, create_task_instance, creat
     triggered_by_kwargs = {"triggered_by": DagRunTriggeredByType.TEST} if AIRFLOW_V_3_0_PLUS else {}
     dr = dag.create_dagrun(
         run_id="test2",
-        run_type=DagRunType.DATASET_TRIGGERED,
+        run_type=DagRunType.ASSET_TRIGGERED,
         execution_date=execution_date,
         state=None,
         session=session,
         data_interval=(execution_date, execution_date),
         **triggered_by_kwargs,
     )
-    asset1_event = AssetEvent(dataset_id=1)
-    asset2_event_1 = AssetEvent(dataset_id=2)
-    asset2_event_2 = AssetEvent(dataset_id=2)
+    asset1_event = AssetEvent(asset_id=1)
+    asset2_event_1 = AssetEvent(asset_id=2)
+    asset2_event_2 = AssetEvent(asset_id=2)
 
     dag_asset_ref = DagScheduleAssetReference(dag_id=dag.dag_id)
     session.add(dag_asset_ref)
-    dag_asset_ref.dataset = ds1
+    dag_asset_ref.asset = ds1
     task_ds_ref = TaskOutletAssetReference(task_id=task1.task_id, dag_id=dag.dag_id)
     session.add(task_ds_ref)
-    task_ds_ref.dataset = ds1
+    task_ds_ref.asset = ds1
 
-    dr.consumed_dataset_events.append(asset1_event)
-    dr.consumed_dataset_events.append(asset2_event_1)
-    dr.consumed_dataset_events.append(asset2_event_2)
+    dr.consumed_asset_events.append(asset1_event)
+    dr.consumed_asset_events.append(asset2_event_1)
+    dr.consumed_asset_events.append(asset2_event_2)
     session.commit()
     TracebackSessionForTests.set_allow_db_access(session, False)
 
-    print(asset2_event_2.dataset.consuming_dags)
+    print(asset2_event_2.asset.consuming_dags)
     pydantic_dse1 = AssetEventPydantic.model_validate(asset1_event)
     json_string1 = pydantic_dse1.model_dump_json()
     print(json_string1)
@@ -282,16 +282,16 @@ def test_serializing_pydantic_dataset_event(session, create_task_instance, creat
     print(json_string_dr)
 
     deserialized_model1 = AssetEventPydantic.model_validate_json(json_string1)
-    assert deserialized_model1.dataset.id == 1
-    assert deserialized_model1.dataset.uri == "one"
-    assert len(deserialized_model1.dataset.consuming_dags) == 1
-    assert len(deserialized_model1.dataset.producing_tasks) == 1
+    assert deserialized_model1.asset.id == 1
+    assert deserialized_model1.asset.uri == "one"
+    assert len(deserialized_model1.asset.consuming_dags) == 1
+    assert len(deserialized_model1.asset.producing_tasks) == 1
 
     deserialized_model2 = AssetEventPydantic.model_validate_json(json_string2)
-    assert deserialized_model2.dataset.id == 2
-    assert deserialized_model2.dataset.uri == "two"
-    assert len(deserialized_model2.dataset.consuming_dags) == 0
-    assert len(deserialized_model2.dataset.producing_tasks) == 0
+    assert deserialized_model2.asset.id == 2
+    assert deserialized_model2.asset.uri == "two"
+    assert len(deserialized_model2.asset.consuming_dags) == 0
+    assert len(deserialized_model2.asset.producing_tasks) == 0
 
     deserialized_dr = DagRunPydantic.model_validate_json(json_string_dr)
-    assert len(deserialized_dr.consumed_dataset_events) == 3
+    assert len(deserialized_dr.consumed_asset_events) == 3
diff --git a/tests/serialization/test_serde.py b/tests/serialization/test_serde.py
index e37464905d41b..11010af86ab93 100644
--- a/tests/serialization/test_serde.py
+++ b/tests/serialization/test_serde.py
@@ -350,9 +350,9 @@ def test_backwards_compat(self):
                 "__type": "dict",
             },
         }
-        dataset = deserialize(data)
-        assert dataset.extra == {"hi": "bye"}
-        assert dataset.uri == uri
+        asset = deserialize(data)
+        assert asset.extra == {"hi": "bye"}
+        assert asset.uri == uri
 
     def test_backwards_compat_wrapped(self):
         """
@@ -364,10 +364,10 @@ def test_backwards_compat_wrapped(self):
         e = deserialize(i)
         assert e["extra"] == {"hi": "bye"}
 
-    def test_encode_dataset(self):
-        dataset = Asset("mytest://dataset")
-        obj = deserialize(serialize(dataset))
-        assert dataset.uri == obj.uri
+    def test_encode_asset(self):
+        asset = Asset("mytest://asset")
+        obj = deserialize(serialize(asset))
+        assert asset.uri == obj.uri
 
     def test_serializers_importable_and_str(self):
         """test if all distributed serializers are lazy loading and can be imported"""
diff --git a/tests/timetables/test_assets_timetable.py b/tests/timetables/test_assets_timetable.py
index f2105891c7298..0d931aa336fff 100644
--- a/tests/timetables/test_assets_timetable.py
+++ b/tests/timetables/test_assets_timetable.py
@@ -213,8 +213,8 @@ def asset_events(mocker) -> list[AssetEvent]:
     mock_dag_run_later.data_interval_end = later
 
     # Create AssetEvent objects with mock source_dag_run
-    event_earlier = AssetEvent(timestamp=earlier, dataset_id=1)
-    event_later = AssetEvent(timestamp=later, dataset_id=1)
+    event_earlier = AssetEvent(timestamp=earlier, asset_id=1)
+    event_later = AssetEvent(timestamp=later, asset_id=1)
 
     # Use mocker to set the source_dag_run attribute to avoid SQLAlchemy's instrumentation
     mocker.patch.object(event_earlier, "source_dag_run", new=mock_dag_run_earlier)
@@ -265,7 +265,7 @@ def test_summary(session: Session) -> None:
     table = AssetTriggeredTimetable(asset_alias)
     assert table.summary == "Unresolved AssetAlias"
 
-    asset_alias_model.datasets.append(asset_model)
+    asset_alias_model.assets.append(asset_model)
     session.add(asset_alias_model)
     session.commit()
 
diff --git a/tests/utils/test_db_cleanup.py b/tests/utils/test_db_cleanup.py
index 53e242df089bf..c957f77a94b2d 100644
--- a/tests/utils/test_db_cleanup.py
+++ b/tests/utils/test_db_cleanup.py
@@ -331,8 +331,8 @@ def test_no_models_missing(self):
             "ab_user",
             "variable",  # leave alone
             "asset_active",  # not good way to know if "stale"
-            "dataset",  # not good way to know if "stale"
-            "dataset_alias",  # not good way to know if "stale"
+            "asset",  # not good way to know if "stale"
+            "asset_alias",  # not good way to know if "stale"
             "task_map",  # keys to TI, so no need
             "serialized_dag",  # handled through FK to Dag
             "log_template",  # not a significant source of data; age not indicative of staleness
@@ -343,11 +343,11 @@ def test_no_models_missing(self):
             "dag_warning",  # self-maintaining
             "connection",  # leave alone
             "slot_pool",  # leave alone
-            "dag_schedule_dataset_reference",  # leave alone for now
-            "dag_schedule_dataset_alias_reference",  # leave alone for now
-            "task_outlet_dataset_reference",  # leave alone for now
-            "dataset_dag_run_queue",  # self-managed
-            "dataset_event_dag_run",  # foreign keys
+            "dag_schedule_asset_reference",  # leave alone for now
+            "dag_schedule_asset_alias_reference",  # leave alone for now
+            "task_outlet_asset_reference",  # leave alone for now
+            "asset_dag_run_queue",  # self-managed
+            "asset_event_dag_run",  # foreign keys
             "task_instance_note",  # foreign keys
             "dag_run_note",  # foreign keys
             "rendered_task_instance_fields",  # foreign key with TI
diff --git a/tests/www/views/test_views_cluster_activity.py b/tests/www/views/test_views_cluster_activity.py
index a8c2a175511de..b675a7241ab9a 100644
--- a/tests/www/views/test_views_cluster_activity.py
+++ b/tests/www/views/test_views_cluster_activity.py
@@ -75,7 +75,7 @@ def _make_dag_runs(dag_maker, session, time_machine):
     run2 = dag_maker.create_dagrun(
         run_id="run_2",
         state=DagRunState.FAILED,
-        run_type=DagRunType.DATASET_TRIGGERED,
+        run_type=DagRunType.ASSET_TRIGGERED,
         execution_date=date + timedelta(days=1),
         start_date=date + timedelta(days=1),
     )
@@ -109,7 +109,7 @@ def test_historical_metrics_data(admin_client, session, time_machine):
     assert resp.status_code == 200
     assert resp.json == {
         "dag_run_states": {"failed": 1, "queued": 0, "running": 1, "success": 1},
-        "dag_run_types": {"backfill": 0, "dataset_triggered": 1, "manual": 0, "scheduled": 2},
+        "dag_run_types": {"backfill": 0, "asset_triggered": 1, "manual": 0, "scheduled": 2},
         "task_instance_states": {
             "deferred": 0,
             "failed": 2,
@@ -137,7 +137,7 @@ def test_historical_metrics_data_date_filters(admin_client, session):
     assert resp.status_code == 200
     assert resp.json == {
         "dag_run_states": {"failed": 1, "queued": 0, "running": 0, "success": 0},
-        "dag_run_types": {"backfill": 0, "dataset_triggered": 1, "manual": 0, "scheduled": 0},
+        "dag_run_types": {"backfill": 0, "asset_triggered": 1, "manual": 0, "scheduled": 0},
         "task_instance_states": {
             "deferred": 0,
             "failed": 2,
diff --git a/tests/www/views/test_views_dataset.py b/tests/www/views/test_views_dataset.py
index b712a43da515e..0a5cd9c7169c2 100644
--- a/tests/www/views/test_views_dataset.py
+++ b/tests/www/views/test_views_dataset.py
@@ -58,22 +58,22 @@ def test_should_respond_200(self, admin_client, create_assets, session):
         assert session.query(AssetModel).count() == 2
 
         with assert_queries_count(10):
-            response = admin_client.get("/object/datasets_summary")
+            response = admin_client.get("/object/assets_summary")
 
         assert response.status_code == 200
         response_data = response.json
         assert response_data == {
-            "datasets": [
+            "assets": [
                 {
                     "id": 1,
                     "uri": "s3://bucket/key/1",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
                 {
                     "id": 2,
                     "uri": "s3://bucket/key/2",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
             ],
@@ -85,7 +85,7 @@ def test_order_by_raises_400_for_invalid_attr(self, admin_client, create_assets,
         session.commit()
         assert session.query(AssetModel).count() == 2
 
-        response = admin_client.get("/object/datasets_summary?order_by=fake")
+        response = admin_client.get("/object/assets_summary?order_by=fake")
 
         assert response.status_code == 400
         msg = "Ordering with 'fake' is disallowed or the attribute does not exist on the model"
@@ -96,12 +96,12 @@ def test_order_by_raises_400_for_invalid_datetimes(self, admin_client, create_as
         session.commit()
         assert session.query(AssetModel).count() == 2
 
-        response = admin_client.get("/object/datasets_summary?updated_before=null")
+        response = admin_client.get("/object/assets_summary?updated_before=null")
 
         assert response.status_code == 400
         assert "Invalid datetime:" in response.text
 
-        response = admin_client.get("/object/datasets_summary?updated_after=null")
+        response = admin_client.get("/object/assets_summary?updated_after=null")
 
         assert response.status_code == 400
         assert "Invalid datetime:" in response.text
@@ -113,7 +113,7 @@ def test_filter_by_datetimes(self, admin_client, create_assets, session):
         # Update assets, one per day, starting with assets[0], ending with assets[2]
         asset_events = [
             AssetEvent(
-                dataset_id=a.id,
+                asset_id=a.id,
                 timestamp=today.add(days=-len(assets) + i + 1),
             )
             for i, a in enumerate(assets)
@@ -123,41 +123,41 @@ def test_filter_by_datetimes(self, admin_client, create_assets, session):
         assert session.query(AssetModel).count() == len(assets)
 
         cutoff = today.add(days=-1).add(minutes=-5).to_iso8601_string()
-        response = admin_client.get(f"/object/datasets_summary?updated_after={cutoff}")
+        response = admin_client.get(f"/object/assets_summary?updated_after={cutoff}")
 
         assert response.status_code == 200
         assert response.json["total_entries"] == 2
-        assert [json_dict["id"] for json_dict in response.json["datasets"]] == [2, 3]
+        assert [json_dict["id"] for json_dict in response.json["assets"]] == [2, 3]
 
         cutoff = today.add(days=-1).add(minutes=5).to_iso8601_string()
-        response = admin_client.get(f"/object/datasets_summary?updated_before={cutoff}")
+        response = admin_client.get(f"/object/assets_summary?updated_before={cutoff}")
 
         assert response.status_code == 200
         assert response.json["total_entries"] == 2
-        assert [json_dict["id"] for json_dict in response.json["datasets"]] == [1, 2]
+        assert [json_dict["id"] for json_dict in response.json["assets"]] == [1, 2]
 
     @pytest.mark.parametrize(
         "order_by, ordered_asset_ids",
         [
             ("uri", [1, 2, 3, 4]),
             ("-uri", [4, 3, 2, 1]),
-            ("last_dataset_update", [4, 1, 3, 2]),
-            ("-last_dataset_update", [2, 3, 1, 4]),
+            ("last_asset_update", [4, 1, 3, 2]),
+            ("-last_asset_update", [2, 3, 1, 4]),
         ],
     )
     def test_order_by(self, admin_client, session, create_assets, order_by, ordered_asset_ids):
         assets = create_assets(range(1, len(ordered_asset_ids) + 1))
         asset_events = [
             AssetEvent(
-                dataset_id=assets[2].id,
+                asset_id=assets[2].id,
                 timestamp=pendulum.today("UTC").add(days=-3),
             ),
             AssetEvent(
-                dataset_id=assets[1].id,
+                asset_id=assets[1].id,
                 timestamp=pendulum.today("UTC").add(days=-2),
             ),
             AssetEvent(
-                dataset_id=assets[1].id,
+                asset_id=assets[1].id,
                 timestamp=pendulum.today("UTC").add(days=-1),
             ),
         ]
@@ -165,10 +165,10 @@ def test_order_by(self, admin_client, session, create_assets, order_by, ordered_
         session.commit()
         assert session.query(AssetModel).count() == len(ordered_asset_ids)
 
-        response = admin_client.get(f"/object/datasets_summary?order_by={order_by}")
+        response = admin_client.get(f"/object/assets_summary?order_by={order_by}")
 
         assert response.status_code == 200
-        assert ordered_asset_ids == [json_dict["id"] for json_dict in response.json["datasets"]]
+        assert ordered_asset_ids == [json_dict["id"] for json_dict in response.json["assets"]]
         assert response.json["total_entries"] == len(ordered_asset_ids)
 
     def test_search_uri_pattern(self, admin_client, create_assets, session):
@@ -177,16 +177,16 @@ def test_search_uri_pattern(self, admin_client, create_assets, session):
         assert session.query(AssetModel).count() == 2
 
         uri_pattern = "key_2"
-        response = admin_client.get(f"/object/datasets_summary?uri_pattern={uri_pattern}")
+        response = admin_client.get(f"/object/assets_summary?uri_pattern={uri_pattern}")
 
         assert response.status_code == 200
         response_data = response.json
         assert response_data == {
-            "datasets": [
+            "assets": [
                 {
                     "id": 2,
                     "uri": "s3://bucket/key/2",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
             ],
@@ -194,22 +194,22 @@ def test_search_uri_pattern(self, admin_client, create_assets, session):
         }
 
         uri_pattern = "s3://bucket/key_"
-        response = admin_client.get(f"/object/datasets_summary?uri_pattern={uri_pattern}")
+        response = admin_client.get(f"/object/assets_summary?uri_pattern={uri_pattern}")
 
         assert response.status_code == 200
         response_data = response.json
         assert response_data == {
-            "datasets": [
+            "assets": [
                 {
                     "id": 1,
                     "uri": "s3://bucket/key/1",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
                 {
                     "id": 2,
                     "uri": "s3://bucket/key/2",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
             ],
@@ -274,7 +274,7 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
             session.add_all(
                 [
                     AssetEvent(
-                        dataset_id=asset1_id,
+                        asset_id=asset1_id,
                         timestamp=pendulum.DateTime(2022, 8, 1, i, tzinfo=UTC),
                     )
                     for i in range(3)
@@ -284,7 +284,7 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
             session.add_all(
                 [
                     AssetEvent(
-                        dataset_id=asset3_id,
+                        asset_id=asset3_id,
                         timestamp=pendulum.DateTime(2022, 8, 1, i, tzinfo=UTC),
                     )
                     for i in range(3)
@@ -294,7 +294,7 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
             session.add_all(
                 [
                     AssetEvent(
-                        dataset_id=asset4_id,
+                        asset_id=asset4_id,
                         timestamp=pendulum.DateTime(2022, 8, 1, i, tzinfo=UTC),
                     )
                     for i in range(4)
@@ -304,7 +304,7 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
             session.add_all(
                 [
                     AssetEvent(
-                        dataset_id=asset5_id,
+                        asset_id=asset5_id,
                         timestamp=pendulum.DateTime(2022, 8, 1, i, tzinfo=UTC),
                     )
                     for i in range(5)
@@ -312,40 +312,40 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
             )
             session.commit()
 
-            response = admin_client.get("/object/datasets_summary")
+            response = admin_client.get("/object/assets_summary")
 
         assert response.status_code == 200
         response_data = response.json
         assert response_data == {
-            "datasets": [
+            "assets": [
                 {
                     "id": asset1_id,
                     "uri": "s3://bucket/key/1",
-                    "last_dataset_update": "2022-08-01T02:00:00+00:00",
+                    "last_asset_update": "2022-08-01T02:00:00+00:00",
                     "total_updates": 3,
                 },
                 {
                     "id": asset2_id,
                     "uri": "s3://bucket/key/2",
-                    "last_dataset_update": None,
+                    "last_asset_update": None,
                     "total_updates": 0,
                 },
                 {
                     "id": asset3_id,
                     "uri": "s3://bucket/key/3",
-                    "last_dataset_update": "2022-08-01T02:00:00+00:00",
+                    "last_asset_update": "2022-08-01T02:00:00+00:00",
                     "total_updates": 3,
                 },
                 {
                     "id": asset4_id,
                     "uri": "s3://bucket/key/4",
-                    "last_dataset_update": "2022-08-01T03:00:00+00:00",
+                    "last_asset_update": "2022-08-01T03:00:00+00:00",
                     "total_updates": 4,
                 },
                 {
                     "id": asset5_id,
                     "uri": "s3://bucket/key/5",
-                    "last_dataset_update": "2022-08-01T04:00:00+00:00",
+                    "last_asset_update": "2022-08-01T04:00:00+00:00",
                     "total_updates": 5,
                 },
             ],
@@ -355,53 +355,53 @@ def test_correct_counts_update(self, admin_client, session, dag_maker, app, monk
 
 class TestGetDatasetsEndpointPagination(TestDatasetEndpoint):
     @pytest.mark.parametrize(
-        "url, expected_dataset_uris",
+        "url, expected_asset_uris",
         [
             # Limit test data
-            ("/object/datasets_summary?limit=1", ["s3://bucket/key/1"]),
-            ("/object/datasets_summary?limit=5", [f"s3://bucket/key/{i}" for i in range(1, 6)]),
+            ("/object/assets_summary?limit=1", ["s3://bucket/key/1"]),
+            ("/object/assets_summary?limit=5", [f"s3://bucket/key/{i}" for i in range(1, 6)]),
             # Offset test data
-            ("/object/datasets_summary?offset=1", [f"s3://bucket/key/{i}" for i in range(2, 10)]),
-            ("/object/datasets_summary?offset=3", [f"s3://bucket/key/{i}" for i in range(4, 10)]),
+            ("/object/assets_summary?offset=1", [f"s3://bucket/key/{i}" for i in range(2, 10)]),
+            ("/object/assets_summary?offset=3", [f"s3://bucket/key/{i}" for i in range(4, 10)]),
             # Limit and offset test data
-            ("/object/datasets_summary?offset=3&limit=3", [f"s3://bucket/key/{i}" for i in [4, 5, 6]]),
+            ("/object/assets_summary?offset=3&limit=3", [f"s3://bucket/key/{i}" for i in [4, 5, 6]]),
         ],
     )
-    def test_limit_and_offset(self, admin_client, create_assets, session, url, expected_dataset_uris):
+    def test_limit_and_offset(self, admin_client, create_assets, session, url, expected_asset_uris):
         create_assets(range(1, 10))
         session.commit()
 
         response = admin_client.get(url)
 
         assert response.status_code == 200
-        dataset_uris = [dataset["uri"] for dataset in response.json["datasets"]]
-        assert dataset_uris == expected_dataset_uris
+        asset_uris = [asset["uri"] for asset in response.json["assets"]]
+        assert asset_uris == expected_asset_uris
 
     def test_should_respect_page_size_limit_default(self, admin_client, create_assets, session):
         create_assets(range(1, 60))
         session.commit()
 
-        response = admin_client.get("/object/datasets_summary")
+        response = admin_client.get("/object/assets_summary")
 
         assert response.status_code == 200
-        assert len(response.json["datasets"]) == 25
+        assert len(response.json["assets"]) == 25
 
     def test_should_return_max_if_req_above(self, admin_client, create_assets, session):
         create_assets(range(1, 60))
         session.commit()
 
-        response = admin_client.get("/object/datasets_summary?limit=180")
+        response = admin_client.get("/object/assets_summary?limit=180")
 
         assert response.status_code == 200
-        assert len(response.json["datasets"]) == 50
+        assert len(response.json["assets"]) == 50
 
 
 class TestGetDatasetNextRunSummary(TestDatasetEndpoint):
-    def test_next_run_dataset_summary(self, dag_maker, admin_client):
+    def test_next_run_asset_summary(self, dag_maker, admin_client):
         with dag_maker(dag_id="upstream", schedule=[Asset(uri="s3://bucket/key/1")], serialized=True):
             EmptyOperator(task_id="task1")
 
-        response = admin_client.post("/next_run_datasets_summary", data={"dag_ids": ["upstream"]})
+        response = admin_client.post("/next_run_assets_summary", data={"dag_ids": ["upstream"]})
 
         assert response.status_code == 200
         assert response.json == {"upstream": {"ready": 0, "total": 1, "uri": "s3://bucket/key/1"}}
diff --git a/tests/www/views/test_views_grid.py b/tests/www/views/test_views_grid.py
index edf878b9829e7..830cd071abd65 100644
--- a/tests/www/views/test_views_grid.py
+++ b/tests/www/views/test_views_grid.py
@@ -110,7 +110,7 @@ def test_no_runs(admin_client, dag_without_runs):
             "children": [
                 {
                     "extra_links": [],
-                    "has_outlet_datasets": False,
+                    "has_outlet_assets": False,
                     "id": "task1",
                     "instances": [],
                     "is_mapped": False,
@@ -122,7 +122,7 @@ def test_no_runs(admin_client, dag_without_runs):
                     "children": [
                         {
                             "extra_links": [],
-                            "has_outlet_datasets": False,
+                            "has_outlet_assets": False,
                             "id": "mapped_task_group.subtask2",
                             "instances": [],
                             "is_mapped": True,
@@ -141,7 +141,7 @@ def test_no_runs(admin_client, dag_without_runs):
                     "children": [
                         {
                             "extra_links": [],
-                            "has_outlet_datasets": False,
+                            "has_outlet_assets": False,
                             "id": "group.mapped",
                             "instances": [],
                             "is_mapped": True,
@@ -264,7 +264,7 @@ def test_one_run(admin_client, dag_with_runs: list[DagRun], session):
             "children": [
                 {
                     "extra_links": [],
-                    "has_outlet_datasets": False,
+                    "has_outlet_assets": False,
                     "id": "task1",
                     "instances": [
                         {
@@ -297,7 +297,7 @@ def test_one_run(admin_client, dag_with_runs: list[DagRun], session):
                     "children": [
                         {
                             "extra_links": [],
-                            "has_outlet_datasets": False,
+                            "has_outlet_assets": False,
                             "id": "mapped_task_group.subtask2",
                             "instances": [
                                 {
@@ -354,7 +354,7 @@ def test_one_run(admin_client, dag_with_runs: list[DagRun], session):
                     "children": [
                         {
                             "extra_links": [],
-                            "has_outlet_datasets": False,
+                            "has_outlet_assets": False,
                             "id": "group.mapped",
                             "instances": [
                                 {
@@ -437,10 +437,10 @@ def test_has_outlet_asset_flag(admin_client, dag_maker, session, app, monkeypatc
         m.setattr(app, "dag_bag", dag_maker.dagbag)
         resp = admin_client.get(f"/object/grid_data?dag_id={DAG_ID}", follow_redirects=True)
 
-    def _expected_task_details(task_id, has_outlet_datasets):
+    def _expected_task_details(task_id, has_outlet_assets):
         return {
             "extra_links": [],
-            "has_outlet_datasets": has_outlet_datasets,
+            "has_outlet_assets": has_outlet_assets,
             "id": task_id,
             "instances": [],
             "is_mapped": False,
@@ -469,7 +469,7 @@ def _expected_task_details(task_id, has_outlet_datasets):
 
 
 @pytest.mark.need_serialized_dag
-def test_next_run_datasets(admin_client, dag_maker, session, app, monkeypatch):
+def test_next_run_assets(admin_client, dag_maker, session, app, monkeypatch):
     with monkeypatch.context() as m:
         assets = [Asset(uri=f"s3://bucket/key/{i}") for i in [1, 2]]
 
@@ -481,22 +481,22 @@ def test_next_run_datasets(admin_client, dag_maker, session, app, monkeypatch):
         asset1_id = session.query(AssetModel.id).filter_by(uri=assets[0].uri).scalar()
         asset2_id = session.query(AssetModel.id).filter_by(uri=assets[1].uri).scalar()
         adrq = AssetDagRunQueue(
-            target_dag_id=DAG_ID, dataset_id=asset1_id, created_at=pendulum.DateTime(2022, 8, 2, tzinfo=UTC)
+            target_dag_id=DAG_ID, asset_id=asset1_id, created_at=pendulum.DateTime(2022, 8, 2, tzinfo=UTC)
         )
         session.add(adrq)
         asset_events = [
             AssetEvent(
-                dataset_id=asset1_id,
+                asset_id=asset1_id,
                 extra={},
                 timestamp=pendulum.DateTime(2022, 8, 1, 1, tzinfo=UTC),
             ),
             AssetEvent(
-                dataset_id=asset1_id,
+                asset_id=asset1_id,
                 extra={},
                 timestamp=pendulum.DateTime(2022, 8, 2, 1, tzinfo=UTC),
             ),
             AssetEvent(
-                dataset_id=asset1_id,
+                asset_id=asset1_id,
                 extra={},
                 timestamp=pendulum.DateTime(2022, 8, 2, 2, tzinfo=UTC),
             ),
@@ -504,11 +504,11 @@ def test_next_run_datasets(admin_client, dag_maker, session, app, monkeypatch):
         session.add_all(asset_events)
         session.commit()
 
-        resp = admin_client.get(f"/object/next_run_datasets/{DAG_ID}", follow_redirects=True)
+        resp = admin_client.get(f"/object/next_run_assets/{DAG_ID}", follow_redirects=True)
 
     assert resp.status_code == 200, resp.json
     assert resp.json == {
-        "dataset_expression": {"all": ["s3://bucket/key/1", "s3://bucket/key/2"]},
+        "asset_expression": {"all": ["s3://bucket/key/1", "s3://bucket/key/2"]},
         "events": [
             {"id": asset1_id, "uri": "s3://bucket/key/1", "lastUpdate": "2022-08-02T02:00:00+00:00"},
             {"id": asset2_id, "uri": "s3://bucket/key/2", "lastUpdate": None},
@@ -516,7 +516,7 @@ def test_next_run_datasets(admin_client, dag_maker, session, app, monkeypatch):
     }
 
 
-def test_next_run_datasets_404(admin_client):
-    resp = admin_client.get("/object/next_run_datasets/missingdag", follow_redirects=True)
+def test_next_run_assets_404(admin_client):
+    resp = admin_client.get("/object/next_run_assets/missingdag", follow_redirects=True)
     assert resp.status_code == 404, resp.json
     assert resp.json == {"error": "can't find dag missingdag"}
diff --git a/tests/www/views/test_views_trigger_dag.py b/tests/www/views/test_views_trigger_dag.py
index c6a936eebfaf6..8955bcc16765c 100644
--- a/tests/www/views/test_views_trigger_dag.py
+++ b/tests/www/views/test_views_trigger_dag.py
@@ -342,7 +342,7 @@ def test_trigger_dag_params_array_value_none_render(admin_client, dag_maker, ses
         ["", "manual__2023-01-01T00:00:00+00:00", True],
         ["", "scheduled_2023-01-01T00", False],
         ["", "manual_2023-01-01T00", False],
-        ["", "dataset_triggered_2023-01-01T00", False],
+        ["", "asset_triggered_2023-01-01T00", False],
         ["^[0-9]", "manual__2023-01-01T00:00:00+00:00", True],
         ["^[a-z]", "manual__2023-01-01T00:00:00+00:00", True],
     ],