diff --git a/openapi/schemas/leaderboard.openapi.json b/openapi/schemas/leaderboard.openapi.json
index 3b222b27..06693eb3 100644
--- a/openapi/schemas/leaderboard.openapi.json
+++ b/openapi/schemas/leaderboard.openapi.json
@@ -2601,16 +2601,6 @@
   },
   "components": {
     "schemas": {
-      "AgeUserFilterModel_AgeGroup": {
-        "enum": [
-          "0-17",
-          "18-29",
-          "30-39",
-          "40-49",
-          "50-64",
-          "65+"
-        ]
-      },
       "BenchmarkQueryResult": {
         "required": [
           "id",
@@ -2669,16 +2659,6 @@
         },
         "description": "The model for boosting a leaderboard."
       },
-      "ComparisonOperator": {
-        "enum": [
-          "Equal",
-          "NotEqual",
-          "LessThan",
-          "LessThanOrEqual",
-          "GreaterThan",
-          "GreaterThanOrEqual"
-        ]
-      },
       "ConfidenceInterval": {
         "required": [
           "lowerOffset",
@@ -2806,28 +2786,11 @@
             "type": "boolean",
             "description": "If the results should be inversed, meaning people should select the worse model."
           },
-          "validationSetId": {
-            "type": "string",
-            "description": "The Validation set that should be attached to every run.",
-            "nullable": true
-          },
           "audienceId": {
             "type": "string",
-            "description": "Optional audience ID. When provided, the leaderboard will target users who have\n graduated from the audience (i.e., users with a score at or above the audience's minimum threshold).\n Cannot be specified together with Filters.",
+            "description": "Optional audience ID. When provided, evaluations run on the specified audience.\n Defaults to the global audience when not specified.",
             "nullable": true
           },
-          "filters": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/IUserFilterModel"
-                },
-                "nullable": true
-              }
-            ],
-            "description": "The filters will be applied on every order that is created by this leaderboard.\n Cannot be specified together with AudienceId."
-          },
           "featureFlags": {
             "allOf": [
               {
@@ -2902,13 +2865,6 @@
         },
         "description": "The model used to create a sample to a participant."
       },
-      "DeviceType": {
-        "enum": [
-          "Unknown",
-          "Phone",
-          "Tablet"
-        ]
-      },
       "FeatureFlag": {
         "required": [
           "key",
@@ -2981,13 +2937,6 @@
           }
         }
       },
-      "GenderUserFilterModel_Gender": {
-        "enum": [
-          "Male",
-          "Female",
-          "Other"
-        ]
-      },
       "GetBenchmarkByIdResult": {
         "required": [
           "id",
@@ -3263,7 +3212,7 @@
           "isInversed",
           "responseBudget",
           "minResponses",
-          "filters",
+          "audienceId",
           "featureFlags"
         ],
         "type": "object",
@@ -3271,10 +3220,6 @@
           "id": {
             "type": "string"
           },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
           "name": {
             "type": "string"
           },
@@ -3298,16 +3243,13 @@
             "type": "integer",
             "format": "int32"
           },
-          "validationSetId": {
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
             "type": "string",
             "nullable": true
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
           "featureFlags": {
             "type": "array",
             "items": {
@@ -3671,946 +3613,341 @@
           }
         }
       },
-      "ICampaignFilter": {
+      "IMetadataInput": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/ICampaignFilterAndFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterAudienceStateFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignFilter"
+            "$ref": "#/components/schemas/IMetadataInputTextMetadataInput"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "TextMetadataInput": "#/components/schemas/IMetadataInputTextMetadataInput"
+          }
+        }
+      },
+      "IMetadataInputTextMetadataInput": {
+        "required": [
+          "text",
+          "visibilities",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "TextMetadataInput"
+            ],
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter"
+          "text": {
+            "type": "string",
+            "nullable": true
           },
+          "visibilities": {
+            "$ref": "#/components/schemas/MetadataVisibilities"
+          }
+        }
+      },
+      "IMetadataModel": {
+        "required": [
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
           {
-            "$ref": "#/components/schemas/ICampaignFilterCountryFilter"
+            "$ref": "#/components/schemas/IMetadataModelClassificationMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterDemographicFilter"
+            "$ref": "#/components/schemas/IMetadataModelCountMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterDeviceFilter"
+            "$ref": "#/components/schemas/IMetadataModelFileTypeMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterLanguageFilter"
+            "$ref": "#/components/schemas/IMetadataModelImageDimensionMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterNewUserFilter"
+            "$ref": "#/components/schemas/IMetadataModelLocationMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterNotFilter"
+            "$ref": "#/components/schemas/IMetadataModelOriginalFilenameMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterOrFilter"
+            "$ref": "#/components/schemas/IMetadataModelSourceUrlMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterResponseCountFilter"
+            "$ref": "#/components/schemas/IMetadataModelStreamsMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter"
+            "$ref": "#/components/schemas/IMetadataModelTextMetadataModel"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "$ref": "#/components/schemas/IMetadataModelVideoDurationMetadataModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "AndFilter": "#/components/schemas/ICampaignFilterAndFilter",
-            "AudienceStateFilter": "#/components/schemas/ICampaignFilterAudienceStateFilter",
-            "CampaignFilter": "#/components/schemas/ICampaignFilterCampaignFilter",
-            "CampaignSessionCountFilter": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter",
-            "CountryFilter": "#/components/schemas/ICampaignFilterCountryFilter",
-            "DemographicFilter": "#/components/schemas/ICampaignFilterDemographicFilter",
-            "DeviceFilter": "#/components/schemas/ICampaignFilterDeviceFilter",
-            "LanguageFilter": "#/components/schemas/ICampaignFilterLanguageFilter",
-            "NewUserFilter": "#/components/schemas/ICampaignFilterNewUserFilter",
-            "NotFilter": "#/components/schemas/ICampaignFilterNotFilter",
-            "OrFilter": "#/components/schemas/ICampaignFilterOrFilter",
-            "ResponseCountFilter": "#/components/schemas/ICampaignFilterResponseCountFilter",
-            "UserActionRestrictionFilter": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter",
-            "UserScoreFilter": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "ClassificationMetadata": "#/components/schemas/IMetadataModelClassificationMetadataModel",
+            "CountMetadata": "#/components/schemas/IMetadataModelCountMetadataModel",
+            "FileTypeMetadata": "#/components/schemas/IMetadataModelFileTypeMetadataModel",
+            "ImageDimensionMetadata": "#/components/schemas/IMetadataModelImageDimensionMetadataModel",
+            "LocationMetadata": "#/components/schemas/IMetadataModelLocationMetadataModel",
+            "OriginalFilenameMetadata": "#/components/schemas/IMetadataModelOriginalFilenameMetadataModel",
+            "SourceUrlMetadataModel": "#/components/schemas/IMetadataModelSourceUrlMetadataModel",
+            "StreamsMetadata": "#/components/schemas/IMetadataModelStreamsMetadataModel",
+            "TextMetadata": "#/components/schemas/IMetadataModelTextMetadataModel",
+            "VideoDurationMetadata": "#/components/schemas/IMetadataModelVideoDurationMetadataModel"
           }
         }
       },
-      "ICampaignFilterAndFilter": {
+      "IMetadataModelClassificationMetadataModel": {
         "required": [
-          "filters",
+          "classification",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AndFilter"
+              "ClassificationMetadata"
             ],
             "type": "string"
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            },
-            "nullable": true
+          "classification": {
+            "type": "string"
           }
         }
       },
-      "ICampaignFilterAudienceStateFilter": {
+      "IMetadataModelCountMetadataModel": {
         "required": [
-          "audienceId",
+          "count",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AudienceStateFilter"
+              "CountMetadata"
             ],
             "type": "string"
           },
-          "audienceId": {
-            "type": "string"
-          },
-          "allowedStates": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/SimplifiedAudienceUserState"
-            }
-          },
-          "includeUnknownState": {
-            "type": "boolean"
-          },
-          "executionOrder": {
+          "count": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           }
         }
       },
-      "ICampaignFilterCampaignFilter": {
+      "IMetadataModelFileTypeMetadataModel": {
         "required": [
-          "campaignIds",
+          "fileType",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CampaignFilter"
+              "FileTypeMetadata"
             ],
             "type": "string"
           },
-          "campaignIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "fileType": {
+            "$ref": "#/components/schemas/FileType"
           }
         }
       },
-      "ICampaignFilterCampaignSessionCountFilter": {
+      "IMetadataModelImageDimensionMetadataModel": {
         "required": [
-          "sessionCount",
-          "operator",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CampaignSessionCountFilter"
+              "ImageDimensionMetadata"
             ],
             "type": "string"
           },
-          "sessionCount": {
+          "height": {
             "type": "integer",
-            "format": "uint32"
-          },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
+            "format": "int32"
           },
-          "executionOrder": {
+          "width": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           }
         }
       },
-      "ICampaignFilterCountryFilter": {
+      "IMetadataModelLocationMetadataModel": {
         "required": [
-          "countries",
+          "x",
+          "y",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CountryFilter"
+              "LocationMetadata"
             ],
             "type": "string"
           },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "x": {
+            "type": "number",
+            "format": "float"
           },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "y": {
+            "type": "number",
+            "format": "float"
           }
         }
       },
-      "ICampaignFilterDemographicFilter": {
+      "IMetadataModelOriginalFilenameMetadataModel": {
         "required": [
-          "identifier",
-          "values",
+          "originalFilename",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DemographicFilter"
+              "OriginalFilenameMetadata"
             ],
             "type": "string"
           },
-          "identifier": {
+          "originalFilename": {
             "type": "string"
-          },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
           }
         }
       },
-      "ICampaignFilterDeviceFilter": {
+      "IMetadataModelSourceUrlMetadataModel": {
         "required": [
-          "deviceTypes",
+          "url",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DeviceFilter"
+              "SourceUrlMetadataModel"
             ],
             "type": "string"
           },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "url": {
+            "type": "string"
           }
         }
       },
-      "ICampaignFilterLanguageFilter": {
+      "IMetadataModelStreamsMetadataModel": {
         "required": [
-          "languages",
+          "hasVideo",
+          "hasAudio",
+          "hasSubtitles",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LanguageFilter"
+              "StreamsMetadata"
             ],
             "type": "string"
           },
-          "languages": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "hasVideo": {
+            "type": "boolean"
           },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "hasAudio": {
+            "type": "boolean"
+          },
+          "hasSubtitles": {
+            "type": "boolean"
           }
         }
       },
-      "ICampaignFilterNewUserFilter": {
+      "IMetadataModelTextMetadataModel": {
         "required": [
+          "text",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NewUserFilter"
+              "TextMetadata"
             ],
             "type": "string"
           },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "text": {
+            "type": "string",
+            "nullable": true
           }
         }
       },
-      "ICampaignFilterNotFilter": {
+      "IMetadataModelVideoDurationMetadataModel": {
         "required": [
-          "filter",
+          "duration",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NotFilter"
+              "VideoDurationMetadata"
             ],
             "type": "string"
           },
-          "filter": {
-            "$ref": "#/components/schemas/ICampaignFilter"
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
+          "duration": {
+            "type": "string",
+            "format": "date-time"
           }
         }
       },
-      "ICampaignFilterOrFilter": {
+      "ISampleByParticipant": {
         "required": [
-          "filters",
           "_t"
         ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
           },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
+          {
+            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
+            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
           }
         }
       },
-      "ICampaignFilterResponseCountFilter": {
+      "ISampleByParticipantPlaceholderSampleByParticipant": {
         "required": [
-          "responseCount",
-          "dimension",
-          "operator",
+          "identifier",
+          "tags",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ResponseCountFilter"
+              "PlaceholderSampleByParticipant"
             ],
             "type": "string"
           },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
-          },
-          "dimension": {
+          "identifier": {
             "type": "string"
           },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserActionRestrictionFilter": {
-        "required": [
-          "requiredActions",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserActionRestrictionFilter"
-            ],
-            "type": "string"
-          },
-          "requiredActions": { },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserScoreFilter": {
-        "required": [
-          "lowerbound",
-          "upperbound",
-          "dimension",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
-            "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "IMetadataInput": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IMetadataInputTextMetadataInput"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "TextMetadataInput": "#/components/schemas/IMetadataInputTextMetadataInput"
-          }
-        }
-      },
-      "IMetadataInputTextMetadataInput": {
-        "required": [
-          "text",
-          "visibilities",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "TextMetadataInput"
-            ],
-            "type": "string"
-          },
-          "text": {
-            "type": "string",
-            "nullable": true
-          },
-          "visibilities": {
-            "$ref": "#/components/schemas/MetadataVisibilities"
-          }
-        }
-      },
-      "IMetadataModel": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IMetadataModelClassificationMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelCountMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelFileTypeMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelImageDimensionMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelLocationMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelOriginalFilenameMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelSourceUrlMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelStreamsMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelTextMetadataModel"
-          },
-          {
-            "$ref": "#/components/schemas/IMetadataModelVideoDurationMetadataModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "ClassificationMetadata": "#/components/schemas/IMetadataModelClassificationMetadataModel",
-            "CountMetadata": "#/components/schemas/IMetadataModelCountMetadataModel",
-            "FileTypeMetadata": "#/components/schemas/IMetadataModelFileTypeMetadataModel",
-            "ImageDimensionMetadata": "#/components/schemas/IMetadataModelImageDimensionMetadataModel",
-            "LocationMetadata": "#/components/schemas/IMetadataModelLocationMetadataModel",
-            "OriginalFilenameMetadata": "#/components/schemas/IMetadataModelOriginalFilenameMetadataModel",
-            "SourceUrlMetadataModel": "#/components/schemas/IMetadataModelSourceUrlMetadataModel",
-            "StreamsMetadata": "#/components/schemas/IMetadataModelStreamsMetadataModel",
-            "TextMetadata": "#/components/schemas/IMetadataModelTextMetadataModel",
-            "VideoDurationMetadata": "#/components/schemas/IMetadataModelVideoDurationMetadataModel"
-          }
-        }
-      },
-      "IMetadataModelClassificationMetadataModel": {
-        "required": [
-          "classification",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ClassificationMetadata"
-            ],
-            "type": "string"
-          },
-          "classification": {
-            "type": "string"
-          }
-        }
-      },
-      "IMetadataModelCountMetadataModel": {
-        "required": [
-          "count",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CountMetadata"
-            ],
-            "type": "string"
-          },
-          "count": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "IMetadataModelFileTypeMetadataModel": {
-        "required": [
-          "fileType",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "FileTypeMetadata"
-            ],
-            "type": "string"
-          },
-          "fileType": {
-            "$ref": "#/components/schemas/FileType"
-          }
-        }
-      },
-      "IMetadataModelImageDimensionMetadataModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ImageDimensionMetadata"
-            ],
-            "type": "string"
-          },
-          "height": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "width": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "IMetadataModelLocationMetadataModel": {
-        "required": [
-          "x",
-          "y",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LocationMetadata"
-            ],
-            "type": "string"
-          },
-          "x": {
-            "type": "number",
-            "format": "float"
-          },
-          "y": {
-            "type": "number",
-            "format": "float"
-          }
-        }
-      },
-      "IMetadataModelOriginalFilenameMetadataModel": {
-        "required": [
-          "originalFilename",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OriginalFilenameMetadata"
-            ],
-            "type": "string"
-          },
-          "originalFilename": {
-            "type": "string"
-          }
-        }
-      },
-      "IMetadataModelSourceUrlMetadataModel": {
-        "required": [
-          "url",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "SourceUrlMetadataModel"
-            ],
-            "type": "string"
-          },
-          "url": {
-            "type": "string"
-          }
-        }
-      },
-      "IMetadataModelStreamsMetadataModel": {
-        "required": [
-          "hasVideo",
-          "hasAudio",
-          "hasSubtitles",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "StreamsMetadata"
-            ],
-            "type": "string"
-          },
-          "hasVideo": {
-            "type": "boolean"
-          },
-          "hasAudio": {
-            "type": "boolean"
-          },
-          "hasSubtitles": {
-            "type": "boolean"
-          }
-        }
-      },
-      "IMetadataModelTextMetadataModel": {
-        "required": [
-          "text",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "TextMetadata"
-            ],
-            "type": "string"
-          },
-          "text": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
-      "IMetadataModelVideoDurationMetadataModel": {
-        "required": [
-          "duration",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "VideoDurationMetadata"
-            ],
-            "type": "string"
-          },
-          "duration": {
-            "type": "string",
-            "format": "date-time"
-          }
-        }
-      },
-      "ISampleByParticipant": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
-          },
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
-            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        }
-      },
-      "ISampleByParticipantPlaceholderSampleByParticipant": {
-        "required": [
-          "identifier",
-          "tags",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "PlaceholderSampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "ISampleByParticipantSampleByParticipant": {
-        "required": [
-          "id",
-          "identifier",
-          "asset",
-          "tags",
-          "ownerMail",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "SampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "asset": {
-            "$ref": "#/components/schemas/IAssetModel"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "createdAt": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "ownerId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "ownerMail": {
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAgeUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAndUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCampaignUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCountryUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCustomUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelDeviceUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelGenderUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelLanguageUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNewUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNotUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelOrUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "AgeFilter": "#/components/schemas/IUserFilterModelAgeUserFilterModel",
-            "AndFilter": "#/components/schemas/IUserFilterModelAndUserFilterModel",
-            "CampaignFilter": "#/components/schemas/IUserFilterModelCampaignUserFilterModel",
-            "CountryFilter": "#/components/schemas/IUserFilterModelCountryUserFilterModel",
-            "CustomFilter": "#/components/schemas/IUserFilterModelCustomUserFilterModel",
-            "DeviceFilter": "#/components/schemas/IUserFilterModelDeviceUserFilterModel",
-            "GenderFilter": "#/components/schemas/IUserFilterModelGenderUserFilterModel",
-            "LanguageFilter": "#/components/schemas/IUserFilterModelLanguageUserFilterModel",
-            "NewUserFilter": "#/components/schemas/IUserFilterModelNewUserFilterModel",
-            "NotFilter": "#/components/schemas/IUserFilterModelNotUserFilterModel",
-            "OrFilter": "#/components/schemas/IUserFilterModelOrUserFilterModel",
-            "ResponseCountFilter": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel",
-            "UserScoreFilter": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelAgeUserFilterModel": {
-        "required": [
-          "ageGroups",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AgeFilter"
-            ],
-            "type": "string"
-          },
-          "ageGroups": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/AgeUserFilterModel_AgeGroup"
-            }
-          }
-        }
-      },
-      "IUserFilterModelAndUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AndFilter"
-            ],
-            "type": "string"
+          "prompt": {
+            "type": "string",
+            "nullable": true
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCampaignUserFilterModel": {
-        "required": [
-          "campaignIds",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CampaignFilter"
-            ],
-            "type": "string"
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
           },
-          "campaignIds": {
+          "tags": {
             "type": "array",
             "items": {
               "type": "string"
@@ -4618,208 +3955,61 @@
           }
         }
       },
-      "IUserFilterModelCountryUserFilterModel": {
+      "ISampleByParticipantSampleByParticipant": {
         "required": [
-          "countries",
+          "id",
+          "identifier",
+          "asset",
+          "tags",
+          "ownerMail",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CountryFilter"
+              "SampleByParticipant"
             ],
             "type": "string"
           },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCustomUserFilterModel": {
-        "required": [
-          "identifier",
-          "values",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CustomFilter"
-            ],
+          "id": {
             "type": "string"
           },
           "identifier": {
             "type": "string"
           },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelDeviceUserFilterModel": {
-        "required": [
-          "deviceTypes",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DeviceFilter"
-            ],
-            "type": "string"
+          "asset": {
+            "$ref": "#/components/schemas/IAssetModel"
           },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          }
-        }
-      },
-      "IUserFilterModelGenderUserFilterModel": {
-        "required": [
-          "genders",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "GenderFilter"
-            ],
-            "type": "string"
+          "prompt": {
+            "type": "string",
+            "nullable": true
           },
-          "genders": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/GenderUserFilterModel_Gender"
-            }
-          }
-        }
-      },
-      "IUserFilterModelLanguageUserFilterModel": {
-        "required": [
-          "languages",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LanguageFilter"
-            ],
-            "type": "string"
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
           },
-          "languages": {
+          "tags": {
             "type": "array",
             "items": {
               "type": "string"
             }
-          }
-        }
-      },
-      "IUserFilterModelNewUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NewUserFilter"
-            ],
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModelNotUserFilterModel": {
-        "required": [
-          "filter",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NotFilter"
-            ],
-            "type": "string"
-          },
-          "filter": {
-            "$ref": "#/components/schemas/IUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelOrUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelResponseCountUserFilterModel": {
-        "required": [
-          "responseCount",
-          "dimension",
-          "operator",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ResponseCountFilter"
-            ],
-            "type": "string"
           },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
           },
-          "dimension": {
-            "type": "string"
+          "ownerId": {
+            "type": "string",
+            "format": "uuid"
           },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          }
-        }
-      },
-      "IUserFilterModelUserScoreUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
+          "ownerMail": {
             "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string",
-            "nullable": true
           }
         }
       },
@@ -4833,7 +4023,7 @@
           "isInversed",
           "responseBudget",
           "minResponses",
-          "filters",
+          "audienceId",
           "featureFlags"
         ],
         "type": "object",
@@ -4841,10 +4031,6 @@
           "id": {
             "type": "string"
           },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
           "name": {
             "type": "string"
           },
@@ -4868,16 +4054,13 @@
             "type": "integer",
             "format": "int32"
           },
-          "validationSetId": {
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
             "type": "string",
             "nullable": true
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
           "featureFlags": {
             "type": "array",
             "items": {
@@ -5417,13 +4600,6 @@
           }
         }
       },
-      "SimplifiedAudienceUserState": {
-        "enum": [
-          "Distilling",
-          "Graduated",
-          "Dropped"
-        ]
-      },
       "SortCriterion": {
         "required": [
           "propertyName"
diff --git a/openapi/schemas/rapidata.filtered.openapi.json b/openapi/schemas/rapidata.filtered.openapi.json
index 9126ff00..4f3dc523 100644
--- a/openapi/schemas/rapidata.filtered.openapi.json
+++ b/openapi/schemas/rapidata.filtered.openapi.json
@@ -20246,16 +20246,6 @@
         },
         "description": "The model user for submitting a survey"
       },
-      "AgeUserFilterModel_AgeGroup": {
-        "enum": [
-          "0-17",
-          "18-29",
-          "30-39",
-          "40-49",
-          "50-64",
-          "65+"
-        ]
-      },
       "BenchmarkQueryResult": {
         "required": [
           "id",
@@ -20441,28 +20431,11 @@
             "type": "boolean",
             "description": "If the results should be inversed, meaning people should select the worse model."
           },
-          "validationSetId": {
-            "type": "string",
-            "description": "The Validation set that should be attached to every run.",
-            "nullable": true
-          },
           "audienceId": {
             "type": "string",
-            "description": "Optional audience ID. When provided, the leaderboard will target users who have\n graduated from the audience (i.e., users with a score at or above the audience's minimum threshold).\n Cannot be specified together with Filters.",
+            "description": "Optional audience ID. When provided, evaluations run on the specified audience.\n Defaults to the global audience when not specified.",
             "nullable": true
           },
-          "filters": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/IUserFilterModel"
-                },
-                "nullable": true
-              }
-            ],
-            "description": "The filters will be applied on every order that is created by this leaderboard.\n Cannot be specified together with AudienceId."
-          },
           "featureFlags": {
             "allOf": [
               {
@@ -20548,13 +20521,6 @@
           }
         }
       },
-      "GenderUserFilterModel_Gender": {
-        "enum": [
-          "Male",
-          "Female",
-          "Other"
-        ]
-      },
       "GetBenchmarkByIdResult": {
         "required": [
           "id",
@@ -20830,7 +20796,7 @@
           "isInversed",
           "responseBudget",
           "minResponses",
-          "filters",
+          "audienceId",
           "featureFlags"
         ],
         "type": "object",
@@ -20838,10 +20804,6 @@
           "id": {
             "type": "string"
           },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
           "name": {
             "type": "string"
           },
@@ -20865,16 +20827,13 @@
             "type": "integer",
             "format": "int32"
           },
-          "validationSetId": {
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
             "type": "string",
             "nullable": true
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
           "featureFlags": {
             "type": "array",
             "items": {
@@ -20989,979 +20948,220 @@
           }
         }
       },
-      "ICampaignFilter": {
+      "ISampleByParticipant": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/ICampaignFilterAndFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterAudienceStateFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCountryFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterDemographicFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterDeviceFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterLanguageFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterNewUserFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterNotFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterOrFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterResponseCountFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter"
+            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "AndFilter": "#/components/schemas/ICampaignFilterAndFilter",
-            "AudienceStateFilter": "#/components/schemas/ICampaignFilterAudienceStateFilter",
-            "CampaignFilter": "#/components/schemas/ICampaignFilterCampaignFilter",
-            "CampaignSessionCountFilter": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter",
-            "CountryFilter": "#/components/schemas/ICampaignFilterCountryFilter",
-            "DemographicFilter": "#/components/schemas/ICampaignFilterDemographicFilter",
-            "DeviceFilter": "#/components/schemas/ICampaignFilterDeviceFilter",
-            "LanguageFilter": "#/components/schemas/ICampaignFilterLanguageFilter",
-            "NewUserFilter": "#/components/schemas/ICampaignFilterNewUserFilter",
-            "NotFilter": "#/components/schemas/ICampaignFilterNotFilter",
-            "OrFilter": "#/components/schemas/ICampaignFilterOrFilter",
-            "ResponseCountFilter": "#/components/schemas/ICampaignFilterResponseCountFilter",
-            "UserActionRestrictionFilter": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter",
-            "UserScoreFilter": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
+            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
           }
         }
       },
-      "ICampaignFilterAndFilter": {
+      "ISampleByParticipantPlaceholderSampleByParticipant": {
         "required": [
-          "filters",
+          "identifier",
+          "tags",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AndFilter"
+              "PlaceholderSampleByParticipant"
             ],
             "type": "string"
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
+          "identifier": {
+            "type": "string"
+          },
+          "prompt": {
+            "type": "string",
+            "nullable": true
+          },
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
           },
-          "innerFilters": {
+          "tags": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            },
-            "nullable": true
+              "type": "string"
+            }
           }
         }
       },
-      "ICampaignFilterAudienceStateFilter": {
+      "ISampleByParticipantSampleByParticipant": {
         "required": [
-          "audienceId",
+          "id",
+          "identifier",
+          "asset",
+          "tags",
+          "ownerMail",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AudienceStateFilter"
+              "SampleByParticipant"
             ],
             "type": "string"
           },
-          "audienceId": {
+          "id": {
             "type": "string"
           },
-          "allowedStates": {
+          "identifier": {
+            "type": "string"
+          },
+          "asset": {
+            "$ref": "#/components/schemas/IAssetModel"
+          },
+          "prompt": {
+            "type": "string",
+            "nullable": true
+          },
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
+          },
+          "tags": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/SimplifiedAudienceUserState"
+              "type": "string"
             }
           },
-          "includeUnknownState": {
-            "type": "boolean"
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
           },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "ownerId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "ownerMail": {
+            "type": "string"
           }
         }
       },
-      "ICampaignFilterCampaignFilter": {
+      "LeaderboardsQueryResult": {
         "required": [
-          "campaignIds",
-          "_t"
+          "id",
+          "name",
+          "instruction",
+          "showPrompt",
+          "showPromptAsset",
+          "isInversed",
+          "responseBudget",
+          "minResponses",
+          "audienceId",
+          "featureFlags"
         ],
+        "type": "object",
         "properties": {
-          "_t": {
-            "enum": [
-              "CampaignFilter"
-            ],
+          "id": {
             "type": "string"
           },
-          "campaignIds": {
+          "name": {
+            "type": "string"
+          },
+          "instruction": {
+            "type": "string"
+          },
+          "showPrompt": {
+            "type": "boolean"
+          },
+          "showPromptAsset": {
+            "type": "boolean"
+          },
+          "isInversed": {
+            "type": "boolean"
+          },
+          "responseBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "minResponses": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
+            "type": "string",
+            "nullable": true
+          },
+          "featureFlags": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/FeatureFlag"
             }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
           }
         }
       },
-      "ICampaignFilterCampaignSessionCountFilter": {
+      "PagedResultOfBenchmarkQueryResult": {
         "required": [
-          "sessionCount",
-          "operator",
-          "_t"
+          "total",
+          "page",
+          "pageSize",
+          "items"
         ],
+        "type": "object",
         "properties": {
-          "_t": {
-            "enum": [
-              "CampaignSessionCountFilter"
-            ],
-            "type": "string"
+          "total": {
+            "type": "integer",
+            "format": "int64"
           },
-          "sessionCount": {
+          "page": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
+          "pageSize": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BenchmarkQueryResult"
+            }
           },
-          "executionOrder": {
+          "totalPages": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           }
         }
       },
-      "ICampaignFilterCountryFilter": {
+      "PagedResultOfISampleByParticipant": {
         "required": [
-          "countries",
-          "_t"
+          "total",
+          "page",
+          "pageSize",
+          "items"
         ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CountryFilter"
-            ],
-            "type": "string"
-          },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterDemographicFilter": {
-        "required": [
-          "identifier",
-          "values",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DemographicFilter"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterDeviceFilter": {
-        "required": [
-          "deviceTypes",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DeviceFilter"
-            ],
-            "type": "string"
-          },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterLanguageFilter": {
-        "required": [
-          "languages",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LanguageFilter"
-            ],
-            "type": "string"
-          },
-          "languages": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterNewUserFilter": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NewUserFilter"
-            ],
-            "type": "string"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterNotFilter": {
-        "required": [
-          "filter",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NotFilter"
-            ],
-            "type": "string"
-          },
-          "filter": {
-            "$ref": "#/components/schemas/ICampaignFilter"
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          }
-        }
-      },
-      "ICampaignFilterOrFilter": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          }
-        }
-      },
-      "ICampaignFilterResponseCountFilter": {
-        "required": [
-          "responseCount",
-          "dimension",
-          "operator",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ResponseCountFilter"
-            ],
-            "type": "string"
-          },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserActionRestrictionFilter": {
-        "required": [
-          "requiredActions",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserActionRestrictionFilter"
-            ],
-            "type": "string"
-          },
-          "requiredActions": {},
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserScoreFilter": {
-        "required": [
-          "lowerbound",
-          "upperbound",
-          "dimension",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
-            "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ISampleByParticipant": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
-          },
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
-            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        }
-      },
-      "ISampleByParticipantPlaceholderSampleByParticipant": {
-        "required": [
-          "identifier",
-          "tags",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "PlaceholderSampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "ISampleByParticipantSampleByParticipant": {
-        "required": [
-          "id",
-          "identifier",
-          "asset",
-          "tags",
-          "ownerMail",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "SampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "asset": {
-            "$ref": "#/components/schemas/IAssetModel"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "createdAt": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "ownerId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "ownerMail": {
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAgeUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAndUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCampaignUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCountryUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCustomUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelDeviceUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelGenderUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelLanguageUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNewUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNotUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelOrUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "AgeFilter": "#/components/schemas/IUserFilterModelAgeUserFilterModel",
-            "AndFilter": "#/components/schemas/IUserFilterModelAndUserFilterModel",
-            "CampaignFilter": "#/components/schemas/IUserFilterModelCampaignUserFilterModel",
-            "CountryFilter": "#/components/schemas/IUserFilterModelCountryUserFilterModel",
-            "CustomFilter": "#/components/schemas/IUserFilterModelCustomUserFilterModel",
-            "DeviceFilter": "#/components/schemas/IUserFilterModelDeviceUserFilterModel",
-            "GenderFilter": "#/components/schemas/IUserFilterModelGenderUserFilterModel",
-            "LanguageFilter": "#/components/schemas/IUserFilterModelLanguageUserFilterModel",
-            "NewUserFilter": "#/components/schemas/IUserFilterModelNewUserFilterModel",
-            "NotFilter": "#/components/schemas/IUserFilterModelNotUserFilterModel",
-            "OrFilter": "#/components/schemas/IUserFilterModelOrUserFilterModel",
-            "ResponseCountFilter": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel",
-            "UserScoreFilter": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelAgeUserFilterModel": {
-        "required": [
-          "ageGroups",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AgeFilter"
-            ],
-            "type": "string"
-          },
-          "ageGroups": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/AgeUserFilterModel_AgeGroup"
-            }
-          }
-        }
-      },
-      "IUserFilterModelAndUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AndFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCampaignUserFilterModel": {
-        "required": [
-          "campaignIds",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CampaignFilter"
-            ],
-            "type": "string"
-          },
-          "campaignIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCountryUserFilterModel": {
-        "required": [
-          "countries",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CountryFilter"
-            ],
-            "type": "string"
-          },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCustomUserFilterModel": {
-        "required": [
-          "identifier",
-          "values",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CustomFilter"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelDeviceUserFilterModel": {
-        "required": [
-          "deviceTypes",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DeviceFilter"
-            ],
-            "type": "string"
-          },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          }
-        }
-      },
-      "IUserFilterModelGenderUserFilterModel": {
-        "required": [
-          "genders",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "GenderFilter"
-            ],
-            "type": "string"
-          },
-          "genders": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/GenderUserFilterModel_Gender"
-            }
-          }
-        }
-      },
-      "IUserFilterModelLanguageUserFilterModel": {
-        "required": [
-          "languages",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LanguageFilter"
-            ],
-            "type": "string"
-          },
-          "languages": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelNewUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NewUserFilter"
-            ],
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModelNotUserFilterModel": {
-        "required": [
-          "filter",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NotFilter"
-            ],
-            "type": "string"
-          },
-          "filter": {
-            "$ref": "#/components/schemas/IUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelOrUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelResponseCountUserFilterModel": {
-        "required": [
-          "responseCount",
-          "dimension",
-          "operator",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ResponseCountFilter"
-            ],
-            "type": "string"
-          },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          }
-        }
-      },
-      "IUserFilterModelUserScoreUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
-            "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
-      "LeaderboardsQueryResult": {
-        "required": [
-          "id",
-          "name",
-          "instruction",
-          "showPrompt",
-          "showPromptAsset",
-          "isInversed",
-          "responseBudget",
-          "minResponses",
-          "filters",
-          "featureFlags"
-        ],
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
-          "name": {
-            "type": "string"
-          },
-          "instruction": {
-            "type": "string"
-          },
-          "showPrompt": {
-            "type": "boolean"
-          },
-          "showPromptAsset": {
-            "type": "boolean"
-          },
-          "isInversed": {
-            "type": "boolean"
-          },
-          "responseBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "minResponses": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "validationSetId": {
-            "type": "string",
-            "nullable": true
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
-          }
-        }
-      },
-      "PagedResultOfBenchmarkQueryResult": {
-        "required": [
-          "total",
-          "page",
-          "pageSize",
-          "items"
-        ],
-        "type": "object",
-        "properties": {
-          "total": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "page": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "pageSize": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/BenchmarkQueryResult"
-            }
-          },
-          "totalPages": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "PagedResultOfISampleByParticipant": {
-        "required": [
-          "total",
-          "page",
-          "pageSize",
-          "items"
-        ],
-        "type": "object",
+        "type": "object",
         "properties": {
           "total": {
             "type": "integer",
@@ -22726,6 +21926,16 @@
           }
         }
       },
+      "AgeUserFilterModel_AgeGroup": {
+        "enum": [
+          "0-17",
+          "18-29",
+          "30-39",
+          "40-49",
+          "50-64",
+          "65+"
+        ]
+      },
       "AggregatorType": {
         "enum": [
           "NonCommittal",
@@ -23345,6 +22555,13 @@
         },
         "description": "The model for submitting feedback."
       },
+      "GenderUserFilterModel_Gender": {
+        "enum": [
+          "Male",
+          "Female",
+          "Other"
+        ]
+      },
       "GetJobByIdEndpoint_Output": {
         "required": [
           "jobId",
@@ -23586,747 +22803,1122 @@
             "type": "string",
             "description": "The current state of the order."
           },
-          "pipelineId": {
+          "pipelineId": {
+            "type": "string",
+            "description": "The ID of the pipeline associated with the order."
+          },
+          "isLocked": {
+            "type": "boolean",
+            "description": "Whether the order is locked."
+          },
+          "isPublic": {
+            "type": "boolean",
+            "description": "Whether the order is publicly visible."
+          },
+          "failureMessage": {
+            "type": "string",
+            "description": "The failure message if the order failed.",
+            "nullable": true
+          }
+        }
+      },
+      "GetPublicOrdersEndpoint_OrderOutput": {
+        "required": [
+          "id",
+          "name",
+          "isPublic"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "isPublic": {
+            "type": "boolean"
+          }
+        }
+      },
+      "GetPublicOrdersEndpoint_Output": {
+        "required": [
+          "orders"
+        ],
+        "type": "object",
+        "properties": {
+          "orders": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/GetPublicOrdersEndpoint_OrderOutput"
+                }
+              }
+            ],
+            "description": "The list of publicly available orders."
+          }
+        }
+      },
+      "IDatasetModel": {
+        "required": [
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IDatasetModelCloneDatasetModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "CloneDatasetModel": "#/components/schemas/IDatasetModelCloneDatasetModel"
+          }
+        }
+      },
+      "IDatasetModelCloneDatasetModel": {
+        "required": [
+          "datasetToCloneId",
+          "datasetName",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "CloneDatasetModel"
+            ],
+            "type": "string"
+          },
+          "datasetToCloneId": {
+            "type": "string"
+          },
+          "datasetName": {
+            "type": "string"
+          }
+        }
+      },
+      "IOrderWorkflowModel": {
+        "required": [
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "EvaluationWorkflow": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel",
+            "GroupedRankingWorkflow": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel",
+            "RankingWorkflow": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel",
+            "SimpleWorkflow": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+          }
+        }
+      },
+      "IOrderWorkflowModelEvaluationWorkflowModel": {
+        "required": [
+          "validationSetId",
+          "shouldAcceptIncorrect",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "EvaluationWorkflow"
+            ],
+            "type": "string"
+          },
+          "validationSetId": {
+            "type": "string"
+          },
+          "shouldAcceptIncorrect": {
+            "type": "boolean"
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
+          }
+        }
+      },
+      "IOrderWorkflowModelGroupedRankingWorkflowModel": {
+        "required": [
+          "criteria",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "GroupedRankingWorkflow"
+            ],
+            "type": "string"
+          },
+          "criteria": {
+            "type": "string"
+          },
+          "pairMakerConfig": {
+            "$ref": "#/components/schemas/IPairMakerConfigModel"
+          },
+          "eloConfig": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EloConfigModel"
+              }
+            ],
+            "deprecated": true
+          },
+          "rankingConfig": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IRankingConfigModel"
+              }
+            ]
+          },
+          "contexts": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "contextAssets": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/IAssetInput"
+            },
+            "nullable": true
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
+          },
+          "maxParallelism": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IOrderWorkflowModelRankingWorkflowModel": {
+        "required": [
+          "criteria",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "RankingWorkflow"
+            ],
+            "type": "string"
+          },
+          "criteria": {
+            "type": "string"
+          },
+          "pairMakerConfig": {
+            "$ref": "#/components/schemas/IPairMakerConfigModel"
+          },
+          "eloConfig": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EloConfigModel"
+              }
+            ],
+            "deprecated": true
+          },
+          "rankingConfig": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IRankingConfigModel"
+              }
+            ]
+          },
+          "context": {
             "type": "string",
-            "description": "The ID of the pipeline associated with the order."
+            "nullable": true
           },
-          "isLocked": {
-            "type": "boolean",
-            "description": "Whether the order is locked."
+          "contextAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetInput"
+              }
+            ]
           },
-          "isPublic": {
-            "type": "boolean",
-            "description": "Whether the order is publicly visible."
+          "metadata": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Metadata_IOrderMetadataInput"
+                },
+                "nullable": true
+              }
+            ],
+            "deprecated": true
           },
-          "failureMessage": {
-            "type": "string",
-            "description": "The failure message if the order failed.",
-            "nullable": true
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
           }
         }
       },
-      "GetPublicOrdersEndpoint_OrderOutput": {
+      "IOrderWorkflowModelSimpleWorkflowModel": {
         "required": [
-          "id",
-          "name",
-          "isPublic"
+          "blueprint",
+          "_t"
         ],
-        "type": "object",
         "properties": {
-          "id": {
+          "_t": {
+            "enum": [
+              "SimpleWorkflow"
+            ],
             "type": "string"
           },
-          "name": {
-            "type": "string"
+          "blueprint": {
+            "$ref": "#/components/schemas/IRapidBlueprint"
           },
-          "isPublic": {
-            "type": "boolean"
+          "batchSize": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
           }
         }
       },
-      "GetPublicOrdersEndpoint_Output": {
+      "IPairMakerConfigModel": {
         "required": [
-          "orders"
+          "_t"
         ],
         "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "OnlinePairMaker": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+          }
+        }
+      },
+      "IPairMakerConfigModelOnlinePairMakerConfigModel": {
+        "required": [
+          "_t"
+        ],
         "properties": {
-          "orders": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/GetPublicOrdersEndpoint_OrderOutput"
-                }
-              }
+          "_t": {
+            "enum": [
+              "OnlinePairMaker"
             ],
-            "description": "The list of publicly available orders."
+            "type": "string"
+          },
+          "randomMatchesRatio": {
+            "type": "number",
+            "format": "float"
+          },
+          "totalComparisonBudget": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IDatasetModel": {
+      "IPipelineArtifactModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IDatasetModelCloneDatasetModel"
+            "$ref": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "CloneDatasetModel": "#/components/schemas/IDatasetModelCloneDatasetModel"
+            "CreateDatasetArtifactModel": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
           }
         }
       },
-      "IDatasetModelCloneDatasetModel": {
+      "IPipelineArtifactModelCreateDatasetArtifactModel": {
         "required": [
-          "datasetToCloneId",
-          "datasetName",
+          "identifier",
+          "dataset",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CloneDatasetModel"
+              "CreateDatasetArtifactModel"
             ],
             "type": "string"
           },
-          "datasetToCloneId": {
+          "identifier": {
             "type": "string"
           },
-          "datasetName": {
-            "type": "string"
+          "dataset": {
+            "$ref": "#/components/schemas/IDatasetModel"
           }
         }
       },
-      "IOrderWorkflowModel": {
+      "IPipelineModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+            "$ref": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "EvaluationWorkflow": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel",
-            "GroupedRankingWorkflow": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel",
-            "RankingWorkflow": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel",
-            "SimpleWorkflow": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+            "CreateSimplePipelineModel": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
           }
         }
       },
-      "IOrderWorkflowModelEvaluationWorkflowModel": {
+      "IPipelineModelCreateSimplePipelineModel": {
         "required": [
-          "validationSetId",
-          "shouldAcceptIncorrect",
+          "artifacts",
+          "pipelineSteps",
+          "namePrefix",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EvaluationWorkflow"
+              "CreateSimplePipelineModel"
             ],
             "type": "string"
           },
-          "validationSetId": {
-            "type": "string"
-          },
-          "shouldAcceptIncorrect": {
-            "type": "boolean"
+          "artifacts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/IPipelineArtifactModel"
+            }
           },
-          "featureFlags": {
+          "pipelineSteps": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
+              "$ref": "#/components/schemas/IPipelineStepModel"
             }
+          },
+          "namePrefix": {
+            "type": "string"
           }
         }
       },
-      "IOrderWorkflowModelGroupedRankingWorkflowModel": {
+      "IPipelineStepModel": {
         "required": [
-          "criteria",
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "DatasetEvaluationStepModel": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel",
+            "SendCompletionMailStepModel": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel",
+            "WorkflowAggregationStepModel": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel",
+            "WorkflowLabelingStepModel": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          }
+        }
+      },
+      "IPipelineStepModelDatasetEvaluationStepModel": {
+        "required": [
+          "datasetArtifactId",
+          "aggregationResultFileArtifactId",
+          "evaluationResultFileArtifactId",
+          "receiver",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "GroupedRankingWorkflow"
+              "DatasetEvaluationStepModel"
             ],
             "type": "string"
           },
-          "criteria": {
+          "datasetArtifactId": {
             "type": "string"
           },
-          "pairMakerConfig": {
-            "$ref": "#/components/schemas/IPairMakerConfigModel"
-          },
-          "eloConfig": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/EloConfigModel"
-              }
-            ],
-            "deprecated": true
-          },
-          "rankingConfig": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IRankingConfigModel"
-              }
-            ]
-          },
-          "contexts": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            },
-            "nullable": true
-          },
-          "contextAssets": {
-            "type": "object",
-            "additionalProperties": {
-              "$ref": "#/components/schemas/IAssetInput"
-            },
-            "nullable": true
+          "aggregationResultFileArtifactId": {
+            "type": "string"
           },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "evaluationResultFileArtifactId": {
+            "type": "string"
           },
-          "maxParallelism": {
-            "type": "integer",
-            "format": "int32"
+          "receiver": {
+            "type": "string"
           }
         }
       },
-      "IOrderWorkflowModelRankingWorkflowModel": {
+      "IPipelineStepModelSendCompletionMailStepModel": {
         "required": [
-          "criteria",
+          "receiver",
+          "resultsFileArtifactIdentifier",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "RankingWorkflow"
+              "SendCompletionMailStepModel"
             ],
             "type": "string"
           },
-          "criteria": {
+          "receiver": {
             "type": "string"
           },
-          "pairMakerConfig": {
-            "$ref": "#/components/schemas/IPairMakerConfigModel"
-          },
-          "eloConfig": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/EloConfigModel"
-              }
+          "resultsFileArtifactIdentifier": {
+            "type": "string"
+          }
+        }
+      },
+      "IPipelineStepModelWorkflowAggregationStepModel": {
+        "required": [
+          "campaignArtifactId",
+          "workflowArtifactId",
+          "fileArtifactId",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "WorkflowAggregationStepModel"
             ],
-            "deprecated": true
-          },
-          "rankingConfig": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IRankingConfigModel"
-              }
-            ]
+            "type": "string"
           },
-          "context": {
-            "type": "string",
-            "nullable": true
+          "campaignArtifactId": {
+            "type": "string"
           },
-          "contextAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetInput"
-              }
-            ]
+          "workflowArtifactId": {
+            "type": "string"
           },
-          "metadata": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/Metadata_IOrderMetadataInput"
-                },
-                "nullable": true
-              }
-            ],
-            "deprecated": true
+          "fileArtifactId": {
+            "type": "string"
           },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "aggregatorType": {
+            "$ref": "#/components/schemas/AggregatorType"
           }
         }
       },
-      "IOrderWorkflowModelSimpleWorkflowModel": {
+      "IPipelineStepModelWorkflowLabelingStepModel": {
         "required": [
-          "blueprint",
+          "workflowArtifactId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "SimpleWorkflow"
+              "WorkflowLabelingStepModel"
             ],
             "type": "string"
           },
-          "blueprint": {
-            "$ref": "#/components/schemas/IRapidBlueprint"
-          },
-          "batchSize": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "workflowArtifactId": {
+            "type": "string"
           }
         }
       },
-      "IPairMakerConfigModel": {
+      "IRankingConfigModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+            "$ref": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRankingConfigModelEloConfigModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "OnlinePairMaker": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+            "BradleyTerryRankingConfig": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel",
+            "EloConfig": "#/components/schemas/IRankingConfigModelEloConfigModel"
           }
         }
       },
-      "IPairMakerConfigModelOnlinePairMakerConfigModel": {
+      "IRankingConfigModelBradleyTerryRankingConfigModel": {
         "required": [
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "OnlinePairMaker"
+              "BradleyTerryRankingConfig"
             ],
             "type": "string"
           },
-          "randomMatchesRatio": {
-            "type": "number",
-            "format": "float"
+          "startingScore": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IRankingConfigModelEloConfigModel": {
+        "required": [
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "EloConfig"
+            ],
+            "type": "string"
           },
-          "totalComparisonBudget": {
+          "startingElo": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "kFactor": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "scalingFactor": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IPipelineArtifactModel": {
+      "IRapidBlueprint": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
+            "$ref": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintLineRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "CreateDatasetArtifactModel": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
+            "TranscriptionBlueprint": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint",
+            "ScrubBlueprint": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint",
+            "PolygonBlueprint": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint",
+            "NamedEntityBlueprint": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint",
+            "LocateBlueprint": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint",
+            "LineBlueprint": "#/components/schemas/IRapidBlueprintLineRapidBlueprint",
+            "FreeTextBlueprint": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint",
+            "CompareBlueprint": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint",
+            "ClassifyBlueprint": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint",
+            "BoundingBoxBlueprint": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
           }
         }
       },
-      "IPipelineArtifactModelCreateDatasetArtifactModel": {
+      "IRapidBlueprintAttachCategoryRapidBlueprint": {
         "required": [
-          "identifier",
-          "dataset",
+          "title",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CreateDatasetArtifactModel"
+              "ClassifyBlueprint"
             ],
             "type": "string"
           },
-          "identifier": {
-            "type": "string"
+          "possibleCategories": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            ],
+            "deprecated": true
           },
-          "dataset": {
-            "$ref": "#/components/schemas/IDatasetModel"
+          "categories": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AttachCategoryRapidBlueprint_Category"
+            }
+          },
+          "title": {
+            "type": "string"
           }
         }
       },
-      "IPipelineModel": {
+      "IRapidBlueprintBoundingBoxRapidBlueprint": {
         "required": [
+          "target",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "CreateSimplePipelineModel": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
+        "properties": {
+          "_t": {
+            "enum": [
+              "BoundingBoxBlueprint"
+            ],
+            "type": "string"
+          },
+          "target": {
+            "type": "string"
           }
         }
       },
-      "IPipelineModelCreateSimplePipelineModel": {
+      "IRapidBlueprintCompareRapidBlueprint": {
         "required": [
-          "artifacts",
-          "pipelineSteps",
-          "namePrefix",
+          "criteria",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CreateSimplePipelineModel"
+              "CompareBlueprint"
             ],
             "type": "string"
           },
-          "artifacts": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IPipelineArtifactModel"
-            }
+          "criteria": {
+            "type": "string"
           },
-          "pipelineSteps": {
+          "indexIdentifiers": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/IPipelineStepModel"
+              "type": "string"
             }
-          },
-          "namePrefix": {
-            "type": "string"
           }
         }
       },
-      "IPipelineStepModel": {
+      "IRapidBlueprintFreeTextRapidBlueprint": {
         "required": [
+          "question",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel"
+        "properties": {
+          "_t": {
+            "enum": [
+              "FreeTextBlueprint"
+            ],
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel"
+          "question": {
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel"
+          "shouldValidateResponse": {
+            "type": "boolean"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "DatasetEvaluationStepModel": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel",
-            "SendCompletionMailStepModel": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel",
-            "WorkflowAggregationStepModel": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel",
-            "WorkflowLabelingStepModel": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          "validationSystemPrompt": {
+            "type": "string",
+            "nullable": true
           }
         }
       },
-      "IPipelineStepModelDatasetEvaluationStepModel": {
+      "IRapidBlueprintLineRapidBlueprint": {
         "required": [
-          "datasetArtifactId",
-          "aggregationResultFileArtifactId",
-          "evaluationResultFileArtifactId",
-          "receiver",
+          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DatasetEvaluationStepModel"
+              "LineBlueprint"
             ],
             "type": "string"
           },
-          "datasetArtifactId": {
-            "type": "string"
-          },
-          "aggregationResultFileArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "evaluationResultFileArtifactId": {
+          }
+        }
+      },
+      "IRapidBlueprintLocateRapidBlueprint": {
+        "required": [
+          "target",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "LocateBlueprint"
+            ],
             "type": "string"
           },
-          "receiver": {
+          "target": {
             "type": "string"
           }
         }
       },
-      "IPipelineStepModelSendCompletionMailStepModel": {
+      "IRapidBlueprintNamedEntityRapidBlueprint": {
         "required": [
-          "receiver",
-          "resultsFileArtifactIdentifier",
+          "target",
+          "classes",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "SendCompletionMailStepModel"
+              "NamedEntityBlueprint"
             ],
             "type": "string"
           },
-          "receiver": {
+          "target": {
             "type": "string"
           },
-          "resultsFileArtifactIdentifier": {
-            "type": "string"
+          "classes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "IPipelineStepModelWorkflowAggregationStepModel": {
+      "IRapidBlueprintPolygonRapidBlueprint": {
         "required": [
-          "campaignArtifactId",
-          "workflowArtifactId",
-          "fileArtifactId",
+          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "WorkflowAggregationStepModel"
+              "PolygonBlueprint"
             ],
             "type": "string"
           },
-          "campaignArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "workflowArtifactId": {
+          }
+        }
+      },
+      "IRapidBlueprintScrubRapidBlueprint": {
+        "required": [
+          "target",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "ScrubBlueprint"
+            ],
             "type": "string"
           },
-          "fileArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "aggregatorType": {
-            "$ref": "#/components/schemas/AggregatorType"
           }
         }
       },
-      "IPipelineStepModelWorkflowLabelingStepModel": {
+      "IRapidBlueprintTranscriptionRapidBlueprint": {
         "required": [
-          "workflowArtifactId",
+          "title",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "WorkflowLabelingStepModel"
+              "TranscriptionBlueprint"
             ],
             "type": "string"
           },
-          "workflowArtifactId": {
+          "title": {
             "type": "string"
           }
         }
       },
-      "IRankingConfigModel": {
+      "IRefereeModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel"
+            "$ref": "#/components/schemas/IRefereeModelBudgetRefereeModel"
           },
           {
-            "$ref": "#/components/schemas/IRankingConfigModelEloConfigModel"
+            "$ref": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRefereeModelNaiveRefereeModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRefereeModelQuorumRefereeModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "BradleyTerryRankingConfig": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel",
-            "EloConfig": "#/components/schemas/IRankingConfigModelEloConfigModel"
+            "BudgetReferee": "#/components/schemas/IRefereeModelBudgetRefereeModel",
+            "EarlyStoppingReferee": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel",
+            "NaiveReferee": "#/components/schemas/IRefereeModelNaiveRefereeModel",
+            "QuorumReferee": "#/components/schemas/IRefereeModelQuorumRefereeModel"
           }
         }
       },
-      "IRankingConfigModelBradleyTerryRankingConfigModel": {
+      "IRefereeModelBudgetRefereeModel": {
         "required": [
+          "totalBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "BradleyTerryRankingConfig"
+              "BudgetReferee"
             ],
             "type": "string"
           },
-          "startingScore": {
+          "totalBudget": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IRankingConfigModelEloConfigModel": {
+      "IRefereeModelEarlyStoppingRefereeModel": {
         "required": [
+          "maxVotes",
+          "threshold",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EloConfig"
+              "EarlyStoppingReferee"
             ],
             "type": "string"
           },
-          "startingElo": {
+          "maxVotes": {
             "type": "integer",
             "format": "int32"
           },
-          "kFactor": {
+          "threshold": {
+            "type": "number",
+            "format": "double"
+          }
+        }
+      },
+      "IRefereeModelNaiveRefereeModel": {
+        "required": [
+          "totalVotes",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "NaiveReferee"
+            ],
+            "type": "string"
+          },
+          "totalVotes": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IRefereeModelQuorumRefereeModel": {
+        "required": [
+          "maxVotes",
+          "threshold",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "QuorumReferee"
+            ],
+            "type": "string"
+          },
+          "maxVotes": {
             "type": "integer",
             "format": "int32"
           },
-          "scalingFactor": {
+          "threshold": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IRapidBlueprint": {
+      "ISelection": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint"
-          },
-          {
-            "$ref": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionAbTestSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionCappedSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionConditionalValidationSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionDemographicSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintLineRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionEffortCappedSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionLabelingSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionShufflingSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionStaticSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionValidationSelection"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "TranscriptionBlueprint": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint",
-            "ScrubBlueprint": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint",
-            "PolygonBlueprint": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint",
-            "NamedEntityBlueprint": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint",
-            "LocateBlueprint": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint",
-            "LineBlueprint": "#/components/schemas/IRapidBlueprintLineRapidBlueprint",
-            "FreeTextBlueprint": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint",
-            "CompareBlueprint": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint",
-            "ClassifyBlueprint": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint",
-            "BoundingBoxBlueprint": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
+            "AbTestSelection": "#/components/schemas/ISelectionAbTestSelection",
+            "CappedSelection": "#/components/schemas/ISelectionCappedSelection",
+            "ConditionalValidationSelection": "#/components/schemas/ISelectionConditionalValidationSelection",
+            "DemographicSelection": "#/components/schemas/ISelectionDemographicSelection",
+            "EffortCappedSelection": "#/components/schemas/ISelectionEffortCappedSelection",
+            "LabelingSelection": "#/components/schemas/ISelectionLabelingSelection",
+            "ShufflingSelection": "#/components/schemas/ISelectionShufflingSelection",
+            "StaticSelection": "#/components/schemas/ISelectionStaticSelection",
+            "ValidationSelection": "#/components/schemas/ISelectionValidationSelection"
           }
         }
       },
-      "IRapidBlueprintAttachCategoryRapidBlueprint": {
+      "ISelectionAbTestSelection": {
         "required": [
-          "title",
+          "a",
+          "b",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ClassifyBlueprint"
+              "AbTestSelection"
             ],
             "type": "string"
           },
-          "possibleCategories": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            ],
-            "deprecated": true
-          },
-          "categories": {
+          "a": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/AttachCategoryRapidBlueprint_Category"
+              "$ref": "#/components/schemas/ISelection"
             }
           },
-          "title": {
-            "type": "string"
+          "b": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ISelection"
+            }
           }
         }
       },
-      "IRapidBlueprintBoundingBoxRapidBlueprint": {
+      "ISelectionCappedSelection": {
         "required": [
-          "target",
+          "selections",
+          "maxRapids",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "BoundingBoxBlueprint"
+              "CappedSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "selections": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ISelection"
+            }
+          },
+          "maxRapids": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintCompareRapidBlueprint": {
+      "ISelectionConditionalValidationSelection": {
         "required": [
-          "criteria",
+          "validationSetId",
+          "validationChances",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CompareBlueprint"
+              "ConditionalValidationSelection"
             ],
             "type": "string"
           },
-          "criteria": {
+          "validationSetId": {
             "type": "string"
           },
-          "indexIdentifiers": {
+          "validationChances": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConditionalValidationSelection_ValidationChance"
+            }
+          },
+          "dimensions": {
             "type": "array",
             "items": {
               "type": "string"
@@ -24334,517 +23926,472 @@
           }
         }
       },
-      "IRapidBlueprintFreeTextRapidBlueprint": {
+      "ISelectionDemographicSelection": {
         "required": [
-          "question",
+          "keys",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "FreeTextBlueprint"
+              "DemographicSelection"
             ],
             "type": "string"
           },
-          "question": {
-            "type": "string"
-          },
-          "shouldValidateResponse": {
-            "type": "boolean"
+          "keys": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           },
-          "validationSystemPrompt": {
-            "type": "string",
-            "nullable": true
+          "maxRapids": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintLineRapidBlueprint": {
+      "ISelectionEffortCappedSelection": {
         "required": [
-          "target",
+          "effortBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LineBlueprint"
+              "EffortCappedSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "effortBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "retrievalMode": {
+            "$ref": "#/components/schemas/RetrievalMode"
+          },
+          "maxIterations": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintLocateRapidBlueprint": {
+      "ISelectionLabelingSelection": {
         "required": [
-          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LocateBlueprint"
+              "LabelingSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "amount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "effortBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "retrievalMode": {
+            "$ref": "#/components/schemas/RetrievalMode"
+          },
+          "maxIterations": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintNamedEntityRapidBlueprint": {
+      "ISelectionShufflingSelection": {
         "required": [
-          "target",
-          "classes",
+          "selections",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NamedEntityBlueprint"
+              "ShufflingSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
-          },
-          "classes": {
+          "selections": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/ISelection"
             }
           }
         }
       },
-      "IRapidBlueprintPolygonRapidBlueprint": {
+      "ISelectionStaticSelection": {
         "required": [
-          "target",
+          "rapidIds",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "PolygonBlueprint"
+              "StaticSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "rapidIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "IRapidBlueprintScrubRapidBlueprint": {
+      "ISelectionValidationSelection": {
         "required": [
-          "target",
+          "amount",
+          "validationSetId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ScrubBlueprint"
+              "ValidationSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
-          }
-        }
-      },
-      "IRapidBlueprintTranscriptionRapidBlueprint": {
-        "required": [
-          "title",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "TranscriptionBlueprint"
-            ],
-            "type": "string"
+          "amount": {
+            "type": "integer",
+            "format": "int32"
           },
-          "title": {
+          "validationSetId": {
             "type": "string"
           }
         }
       },
-      "IRefereeModel": {
+      "IUserFilterModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRefereeModelBudgetRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelAgeUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelAndUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelNaiveRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelCampaignUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelQuorumRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelCountryUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelCustomUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelDeviceUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelGenderUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelLanguageUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelNewUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelNotUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelOrUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "BudgetReferee": "#/components/schemas/IRefereeModelBudgetRefereeModel",
-            "EarlyStoppingReferee": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel",
-            "NaiveReferee": "#/components/schemas/IRefereeModelNaiveRefereeModel",
-            "QuorumReferee": "#/components/schemas/IRefereeModelQuorumRefereeModel"
-          }
-        }
-      },
-      "IRefereeModelBudgetRefereeModel": {
-        "required": [
-          "totalBudget",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "BudgetReferee"
-            ],
-            "type": "string"
-          },
-          "totalBudget": {
-            "type": "integer",
-            "format": "int32"
+            "AgeFilter": "#/components/schemas/IUserFilterModelAgeUserFilterModel",
+            "AndFilter": "#/components/schemas/IUserFilterModelAndUserFilterModel",
+            "CampaignFilter": "#/components/schemas/IUserFilterModelCampaignUserFilterModel",
+            "CountryFilter": "#/components/schemas/IUserFilterModelCountryUserFilterModel",
+            "CustomFilter": "#/components/schemas/IUserFilterModelCustomUserFilterModel",
+            "DeviceFilter": "#/components/schemas/IUserFilterModelDeviceUserFilterModel",
+            "GenderFilter": "#/components/schemas/IUserFilterModelGenderUserFilterModel",
+            "LanguageFilter": "#/components/schemas/IUserFilterModelLanguageUserFilterModel",
+            "NewUserFilter": "#/components/schemas/IUserFilterModelNewUserFilterModel",
+            "NotFilter": "#/components/schemas/IUserFilterModelNotUserFilterModel",
+            "OrFilter": "#/components/schemas/IUserFilterModelOrUserFilterModel",
+            "ResponseCountFilter": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel",
+            "UserScoreFilter": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
           }
         }
       },
-      "IRefereeModelEarlyStoppingRefereeModel": {
+      "IUserFilterModelAgeUserFilterModel": {
         "required": [
-          "maxVotes",
-          "threshold",
+          "ageGroups",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EarlyStoppingReferee"
+              "AgeFilter"
             ],
             "type": "string"
           },
-          "maxVotes": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "threshold": {
-            "type": "number",
-            "format": "double"
+          "ageGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgeUserFilterModel_AgeGroup"
+            }
           }
         }
       },
-      "IRefereeModelNaiveRefereeModel": {
+      "IUserFilterModelAndUserFilterModel": {
         "required": [
-          "totalVotes",
+          "filters",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NaiveReferee"
+              "AndFilter"
             ],
             "type": "string"
           },
-          "totalVotes": {
-            "type": "integer",
-            "format": "int32"
+          "filters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/IUserFilterModel"
+            }
           }
         }
       },
-      "IRefereeModelQuorumRefereeModel": {
+      "IUserFilterModelCampaignUserFilterModel": {
         "required": [
-          "maxVotes",
-          "threshold",
+          "campaignIds",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "QuorumReferee"
+              "CampaignFilter"
             ],
             "type": "string"
           },
-          "maxVotes": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "threshold": {
-            "type": "integer",
-            "format": "int32"
+          "campaignIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "ISelection": {
+      "IUserFilterModelCountryUserFilterModel": {
         "required": [
+          "countries",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/ISelectionAbTestSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionCappedSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionConditionalValidationSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionDemographicSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionEffortCappedSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionLabelingSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionShufflingSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionStaticSelection"
+        "properties": {
+          "_t": {
+            "enum": [
+              "CountryFilter"
+            ],
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/ISelectionValidationSelection"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "AbTestSelection": "#/components/schemas/ISelectionAbTestSelection",
-            "CappedSelection": "#/components/schemas/ISelectionCappedSelection",
-            "ConditionalValidationSelection": "#/components/schemas/ISelectionConditionalValidationSelection",
-            "DemographicSelection": "#/components/schemas/ISelectionDemographicSelection",
-            "EffortCappedSelection": "#/components/schemas/ISelectionEffortCappedSelection",
-            "LabelingSelection": "#/components/schemas/ISelectionLabelingSelection",
-            "ShufflingSelection": "#/components/schemas/ISelectionShufflingSelection",
-            "StaticSelection": "#/components/schemas/ISelectionStaticSelection",
-            "ValidationSelection": "#/components/schemas/ISelectionValidationSelection"
+          "countries": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "ISelectionAbTestSelection": {
+      "IUserFilterModelCustomUserFilterModel": {
         "required": [
-          "a",
-          "b",
+          "identifier",
+          "values",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AbTestSelection"
+              "CustomFilter"
             ],
             "type": "string"
           },
-          "a": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ISelection"
-            }
+          "identifier": {
+            "type": "string"
           },
-          "b": {
+          "values": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "type": "string"
             }
           }
         }
       },
-      "ISelectionCappedSelection": {
+      "IUserFilterModelDeviceUserFilterModel": {
         "required": [
-          "selections",
-          "maxRapids",
+          "deviceTypes",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CappedSelection"
+              "DeviceFilter"
             ],
             "type": "string"
           },
-          "selections": {
+          "deviceTypes": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "$ref": "#/components/schemas/DeviceType"
             }
-          },
-          "maxRapids": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionConditionalValidationSelection": {
+      "IUserFilterModelGenderUserFilterModel": {
         "required": [
-          "validationSetId",
-          "validationChances",
+          "genders",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ConditionalValidationSelection"
+              "GenderFilter"
             ],
             "type": "string"
           },
-          "validationSetId": {
-            "type": "string"
-          },
-          "validationChances": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ConditionalValidationSelection_ValidationChance"
-            }
-          },
-          "dimensions": {
+          "genders": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/GenderUserFilterModel_Gender"
             }
           }
         }
       },
-      "ISelectionDemographicSelection": {
+      "IUserFilterModelLanguageUserFilterModel": {
         "required": [
-          "keys",
+          "languages",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DemographicSelection"
+              "LanguageFilter"
             ],
             "type": "string"
           },
-          "keys": {
+          "languages": {
             "type": "array",
             "items": {
               "type": "string"
             }
-          },
-          "maxRapids": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionEffortCappedSelection": {
+      "IUserFilterModelNewUserFilterModel": {
         "required": [
-          "effortBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EffortCappedSelection"
+              "NewUserFilter"
             ],
             "type": "string"
-          },
-          "effortBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "retrievalMode": {
-            "$ref": "#/components/schemas/RetrievalMode"
-          },
-          "maxIterations": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionLabelingSelection": {
+      "IUserFilterModelNotUserFilterModel": {
         "required": [
+          "filter",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LabelingSelection"
+              "NotFilter"
             ],
             "type": "string"
           },
-          "amount": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "effortBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "retrievalMode": {
-            "$ref": "#/components/schemas/RetrievalMode"
-          },
-          "maxIterations": {
-            "type": "integer",
-            "format": "int32"
+          "filter": {
+            "$ref": "#/components/schemas/IUserFilterModel"
           }
         }
       },
-      "ISelectionShufflingSelection": {
+      "IUserFilterModelOrUserFilterModel": {
         "required": [
-          "selections",
+          "filters",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ShufflingSelection"
+              "OrFilter"
             ],
             "type": "string"
           },
-          "selections": {
+          "filters": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "$ref": "#/components/schemas/IUserFilterModel"
             }
           }
         }
       },
-      "ISelectionStaticSelection": {
+      "IUserFilterModelResponseCountUserFilterModel": {
         "required": [
-          "rapidIds",
+          "responseCount",
+          "dimension",
+          "operator",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "StaticSelection"
+              "ResponseCountFilter"
             ],
             "type": "string"
           },
-          "rapidIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "responseCount": {
+            "type": "integer",
+            "format": "uint32"
+          },
+          "dimension": {
+            "type": "string"
+          },
+          "operator": {
+            "$ref": "#/components/schemas/ComparisonOperator"
           }
         }
       },
-      "ISelectionValidationSelection": {
+      "IUserFilterModelUserScoreUserFilterModel": {
         "required": [
-          "amount",
-          "validationSetId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ValidationSelection"
+              "UserScoreFilter"
             ],
             "type": "string"
           },
-          "amount": {
-            "type": "integer",
-            "format": "int32"
+          "lowerbound": {
+            "type": "number",
+            "format": "double"
           },
-          "validationSetId": {
-            "type": "string"
+          "upperbound": {
+            "type": "number",
+            "format": "double"
+          },
+          "dimension": {
+            "type": "string",
+            "nullable": true
           }
         }
       },
diff --git a/openapi/schemas/rapidata.openapi.json b/openapi/schemas/rapidata.openapi.json
index 8f008fc4..f86d2cd3 100644
--- a/openapi/schemas/rapidata.openapi.json
+++ b/openapi/schemas/rapidata.openapi.json
@@ -21266,16 +21266,6 @@
         },
         "description": "The model user for submitting a survey"
       },
-      "AgeUserFilterModel_AgeGroup": {
-        "enum": [
-          "0-17",
-          "18-29",
-          "30-39",
-          "40-49",
-          "50-64",
-          "65+"
-        ]
-      },
       "BenchmarkQueryResult": {
         "required": [
           "id",
@@ -21461,28 +21451,11 @@
             "type": "boolean",
             "description": "If the results should be inversed, meaning people should select the worse model."
           },
-          "validationSetId": {
-            "type": "string",
-            "description": "The Validation set that should be attached to every run.",
-            "nullable": true
-          },
           "audienceId": {
             "type": "string",
-            "description": "Optional audience ID. When provided, the leaderboard will target users who have\n graduated from the audience (i.e., users with a score at or above the audience's minimum threshold).\n Cannot be specified together with Filters.",
+            "description": "Optional audience ID. When provided, evaluations run on the specified audience.\n Defaults to the global audience when not specified.",
             "nullable": true
           },
-          "filters": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/IUserFilterModel"
-                },
-                "nullable": true
-              }
-            ],
-            "description": "The filters will be applied on every order that is created by this leaderboard.\n Cannot be specified together with AudienceId."
-          },
           "featureFlags": {
             "allOf": [
               {
@@ -21568,13 +21541,6 @@
           }
         }
       },
-      "GenderUserFilterModel_Gender": {
-        "enum": [
-          "Male",
-          "Female",
-          "Other"
-        ]
-      },
       "GetBenchmarkByIdResult": {
         "required": [
           "id",
@@ -21850,7 +21816,7 @@
           "isInversed",
           "responseBudget",
           "minResponses",
-          "filters",
+          "audienceId",
           "featureFlags"
         ],
         "type": "object",
@@ -21858,10 +21824,6 @@
           "id": {
             "type": "string"
           },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
           "name": {
             "type": "string"
           },
@@ -21885,16 +21847,13 @@
             "type": "integer",
             "format": "int32"
           },
-          "validationSetId": {
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
             "type": "string",
             "nullable": true
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
           "featureFlags": {
             "type": "array",
             "items": {
@@ -22009,979 +21968,220 @@
           }
         }
       },
-      "ICampaignFilter": {
+      "ISampleByParticipant": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/ICampaignFilterAndFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterAudienceStateFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterCountryFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterDemographicFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterDeviceFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterLanguageFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterNewUserFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterNotFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterOrFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterResponseCountFilter"
-          },
-          {
-            "$ref": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter"
+            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
           },
           {
-            "$ref": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "AndFilter": "#/components/schemas/ICampaignFilterAndFilter",
-            "AudienceStateFilter": "#/components/schemas/ICampaignFilterAudienceStateFilter",
-            "CampaignFilter": "#/components/schemas/ICampaignFilterCampaignFilter",
-            "CampaignSessionCountFilter": "#/components/schemas/ICampaignFilterCampaignSessionCountFilter",
-            "CountryFilter": "#/components/schemas/ICampaignFilterCountryFilter",
-            "DemographicFilter": "#/components/schemas/ICampaignFilterDemographicFilter",
-            "DeviceFilter": "#/components/schemas/ICampaignFilterDeviceFilter",
-            "LanguageFilter": "#/components/schemas/ICampaignFilterLanguageFilter",
-            "NewUserFilter": "#/components/schemas/ICampaignFilterNewUserFilter",
-            "NotFilter": "#/components/schemas/ICampaignFilterNotFilter",
-            "OrFilter": "#/components/schemas/ICampaignFilterOrFilter",
-            "ResponseCountFilter": "#/components/schemas/ICampaignFilterResponseCountFilter",
-            "UserActionRestrictionFilter": "#/components/schemas/ICampaignFilterUserActionRestrictionFilter",
-            "UserScoreFilter": "#/components/schemas/ICampaignFilterUserScoreFilter"
+            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
+            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
           }
         }
       },
-      "ICampaignFilterAndFilter": {
+      "ISampleByParticipantPlaceholderSampleByParticipant": {
         "required": [
-          "filters",
+          "identifier",
+          "tags",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AndFilter"
+              "PlaceholderSampleByParticipant"
             ],
             "type": "string"
           },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
+          "identifier": {
+            "type": "string"
+          },
+          "prompt": {
+            "type": "string",
+            "nullable": true
+          },
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
           },
-          "innerFilters": {
+          "tags": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            },
-            "nullable": true
+              "type": "string"
+            }
           }
         }
       },
-      "ICampaignFilterAudienceStateFilter": {
+      "ISampleByParticipantSampleByParticipant": {
         "required": [
-          "audienceId",
+          "id",
+          "identifier",
+          "asset",
+          "tags",
+          "ownerMail",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AudienceStateFilter"
+              "SampleByParticipant"
             ],
             "type": "string"
           },
-          "audienceId": {
+          "id": {
             "type": "string"
           },
-          "allowedStates": {
+          "identifier": {
+            "type": "string"
+          },
+          "asset": {
+            "$ref": "#/components/schemas/IAssetModel"
+          },
+          "prompt": {
+            "type": "string",
+            "nullable": true
+          },
+          "promptAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetModel"
+              }
+            ]
+          },
+          "tags": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/SimplifiedAudienceUserState"
+              "type": "string"
             }
           },
-          "includeUnknownState": {
-            "type": "boolean"
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
           },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
+          "ownerId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "ownerMail": {
+            "type": "string"
           }
         }
       },
-      "ICampaignFilterCampaignFilter": {
+      "LeaderboardsQueryResult": {
         "required": [
-          "campaignIds",
-          "_t"
+          "id",
+          "name",
+          "instruction",
+          "showPrompt",
+          "showPromptAsset",
+          "isInversed",
+          "responseBudget",
+          "minResponses",
+          "audienceId",
+          "featureFlags"
         ],
+        "type": "object",
         "properties": {
-          "_t": {
-            "enum": [
-              "CampaignFilter"
-            ],
+          "id": {
             "type": "string"
           },
-          "campaignIds": {
+          "name": {
+            "type": "string"
+          },
+          "instruction": {
+            "type": "string"
+          },
+          "showPrompt": {
+            "type": "boolean"
+          },
+          "showPromptAsset": {
+            "type": "boolean"
+          },
+          "isInversed": {
+            "type": "boolean"
+          },
+          "responseBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "minResponses": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "audienceId": {
+            "type": "string"
+          },
+          "jobDefinitionId": {
+            "type": "string",
+            "nullable": true
+          },
+          "featureFlags": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/FeatureFlag"
             }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
           }
         }
       },
-      "ICampaignFilterCampaignSessionCountFilter": {
+      "PagedResultOfBenchmarkQueryResult": {
         "required": [
-          "sessionCount",
-          "operator",
-          "_t"
+          "total",
+          "page",
+          "pageSize",
+          "items"
         ],
+        "type": "object",
         "properties": {
-          "_t": {
-            "enum": [
-              "CampaignSessionCountFilter"
-            ],
-            "type": "string"
+          "total": {
+            "type": "integer",
+            "format": "int64"
           },
-          "sessionCount": {
+          "page": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
+          "pageSize": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BenchmarkQueryResult"
+            }
           },
-          "executionOrder": {
+          "totalPages": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           }
         }
       },
-      "ICampaignFilterCountryFilter": {
+      "PagedResultOfISampleByParticipant": {
         "required": [
-          "countries",
-          "_t"
+          "total",
+          "page",
+          "pageSize",
+          "items"
         ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CountryFilter"
-            ],
-            "type": "string"
-          },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterDemographicFilter": {
-        "required": [
-          "identifier",
-          "values",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DemographicFilter"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterDeviceFilter": {
-        "required": [
-          "deviceTypes",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DeviceFilter"
-            ],
-            "type": "string"
-          },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterLanguageFilter": {
-        "required": [
-          "languages",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LanguageFilter"
-            ],
-            "type": "string"
-          },
-          "languages": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterNewUserFilter": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NewUserFilter"
-            ],
-            "type": "string"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterNotFilter": {
-        "required": [
-          "filter",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NotFilter"
-            ],
-            "type": "string"
-          },
-          "filter": {
-            "$ref": "#/components/schemas/ICampaignFilter"
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          }
-        }
-      },
-      "ICampaignFilterOrFilter": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
-          "innerFilters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          }
-        }
-      },
-      "ICampaignFilterResponseCountFilter": {
-        "required": [
-          "responseCount",
-          "dimension",
-          "operator",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ResponseCountFilter"
-            ],
-            "type": "string"
-          },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserActionRestrictionFilter": {
-        "required": [
-          "requiredActions",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserActionRestrictionFilter"
-            ],
-            "type": "string"
-          },
-          "requiredActions": {},
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ICampaignFilterUserScoreFilter": {
-        "required": [
-          "lowerbound",
-          "upperbound",
-          "dimension",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
-            "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "executionOrder": {
-            "type": "integer",
-            "format": "uint32"
-          }
-        }
-      },
-      "ISampleByParticipant": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant"
-          },
-          {
-            "$ref": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "PlaceholderSampleByParticipant": "#/components/schemas/ISampleByParticipantPlaceholderSampleByParticipant",
-            "SampleByParticipant": "#/components/schemas/ISampleByParticipantSampleByParticipant"
-          }
-        }
-      },
-      "ISampleByParticipantPlaceholderSampleByParticipant": {
-        "required": [
-          "identifier",
-          "tags",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "PlaceholderSampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "ISampleByParticipantSampleByParticipant": {
-        "required": [
-          "id",
-          "identifier",
-          "asset",
-          "tags",
-          "ownerMail",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "SampleByParticipant"
-            ],
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "asset": {
-            "$ref": "#/components/schemas/IAssetModel"
-          },
-          "prompt": {
-            "type": "string",
-            "nullable": true
-          },
-          "promptAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetModel"
-              }
-            ]
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "createdAt": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "ownerId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "ownerMail": {
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAgeUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelAndUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCampaignUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCountryUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelCustomUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelDeviceUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelGenderUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelLanguageUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNewUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelNotUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelOrUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel"
-          },
-          {
-            "$ref": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "AgeFilter": "#/components/schemas/IUserFilterModelAgeUserFilterModel",
-            "AndFilter": "#/components/schemas/IUserFilterModelAndUserFilterModel",
-            "CampaignFilter": "#/components/schemas/IUserFilterModelCampaignUserFilterModel",
-            "CountryFilter": "#/components/schemas/IUserFilterModelCountryUserFilterModel",
-            "CustomFilter": "#/components/schemas/IUserFilterModelCustomUserFilterModel",
-            "DeviceFilter": "#/components/schemas/IUserFilterModelDeviceUserFilterModel",
-            "GenderFilter": "#/components/schemas/IUserFilterModelGenderUserFilterModel",
-            "LanguageFilter": "#/components/schemas/IUserFilterModelLanguageUserFilterModel",
-            "NewUserFilter": "#/components/schemas/IUserFilterModelNewUserFilterModel",
-            "NotFilter": "#/components/schemas/IUserFilterModelNotUserFilterModel",
-            "OrFilter": "#/components/schemas/IUserFilterModelOrUserFilterModel",
-            "ResponseCountFilter": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel",
-            "UserScoreFilter": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelAgeUserFilterModel": {
-        "required": [
-          "ageGroups",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AgeFilter"
-            ],
-            "type": "string"
-          },
-          "ageGroups": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/AgeUserFilterModel_AgeGroup"
-            }
-          }
-        }
-      },
-      "IUserFilterModelAndUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "AndFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCampaignUserFilterModel": {
-        "required": [
-          "campaignIds",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CampaignFilter"
-            ],
-            "type": "string"
-          },
-          "campaignIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCountryUserFilterModel": {
-        "required": [
-          "countries",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CountryFilter"
-            ],
-            "type": "string"
-          },
-          "countries": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelCustomUserFilterModel": {
-        "required": [
-          "identifier",
-          "values",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "CustomFilter"
-            ],
-            "type": "string"
-          },
-          "identifier": {
-            "type": "string"
-          },
-          "values": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelDeviceUserFilterModel": {
-        "required": [
-          "deviceTypes",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "DeviceFilter"
-            ],
-            "type": "string"
-          },
-          "deviceTypes": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DeviceType"
-            }
-          }
-        }
-      },
-      "IUserFilterModelGenderUserFilterModel": {
-        "required": [
-          "genders",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "GenderFilter"
-            ],
-            "type": "string"
-          },
-          "genders": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/GenderUserFilterModel_Gender"
-            }
-          }
-        }
-      },
-      "IUserFilterModelLanguageUserFilterModel": {
-        "required": [
-          "languages",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "LanguageFilter"
-            ],
-            "type": "string"
-          },
-          "languages": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "IUserFilterModelNewUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NewUserFilter"
-            ],
-            "type": "string"
-          }
-        }
-      },
-      "IUserFilterModelNotUserFilterModel": {
-        "required": [
-          "filter",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "NotFilter"
-            ],
-            "type": "string"
-          },
-          "filter": {
-            "$ref": "#/components/schemas/IUserFilterModel"
-          }
-        }
-      },
-      "IUserFilterModelOrUserFilterModel": {
-        "required": [
-          "filters",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "OrFilter"
-            ],
-            "type": "string"
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IUserFilterModel"
-            }
-          }
-        }
-      },
-      "IUserFilterModelResponseCountUserFilterModel": {
-        "required": [
-          "responseCount",
-          "dimension",
-          "operator",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "ResponseCountFilter"
-            ],
-            "type": "string"
-          },
-          "responseCount": {
-            "type": "integer",
-            "format": "uint32"
-          },
-          "dimension": {
-            "type": "string"
-          },
-          "operator": {
-            "$ref": "#/components/schemas/ComparisonOperator"
-          }
-        }
-      },
-      "IUserFilterModelUserScoreUserFilterModel": {
-        "required": [
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "UserScoreFilter"
-            ],
-            "type": "string"
-          },
-          "lowerbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "upperbound": {
-            "type": "number",
-            "format": "double"
-          },
-          "dimension": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
-      "LeaderboardsQueryResult": {
-        "required": [
-          "id",
-          "name",
-          "instruction",
-          "showPrompt",
-          "showPromptAsset",
-          "isInversed",
-          "responseBudget",
-          "minResponses",
-          "filters",
-          "featureFlags"
-        ],
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "orderId": {
-            "type": "string",
-            "nullable": true
-          },
-          "name": {
-            "type": "string"
-          },
-          "instruction": {
-            "type": "string"
-          },
-          "showPrompt": {
-            "type": "boolean"
-          },
-          "showPromptAsset": {
-            "type": "boolean"
-          },
-          "isInversed": {
-            "type": "boolean"
-          },
-          "responseBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "minResponses": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "validationSetId": {
-            "type": "string",
-            "nullable": true
-          },
-          "filters": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ICampaignFilter"
-            }
-          },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
-          }
-        }
-      },
-      "PagedResultOfBenchmarkQueryResult": {
-        "required": [
-          "total",
-          "page",
-          "pageSize",
-          "items"
-        ],
-        "type": "object",
-        "properties": {
-          "total": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "page": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "pageSize": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/BenchmarkQueryResult"
-            }
-          },
-          "totalPages": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "PagedResultOfISampleByParticipant": {
-        "required": [
-          "total",
-          "page",
-          "pageSize",
-          "items"
-        ],
-        "type": "object",
+        "type": "object",
         "properties": {
           "total": {
             "type": "integer",
@@ -23746,6 +22946,16 @@
           }
         }
       },
+      "AgeUserFilterModel_AgeGroup": {
+        "enum": [
+          "0-17",
+          "18-29",
+          "30-39",
+          "40-49",
+          "50-64",
+          "65+"
+        ]
+      },
       "AggregatorType": {
         "enum": [
           "NonCommittal",
@@ -24365,6 +23575,13 @@
         },
         "description": "The model for submitting feedback."
       },
+      "GenderUserFilterModel_Gender": {
+        "enum": [
+          "Male",
+          "Female",
+          "Other"
+        ]
+      },
       "GetJobByIdEndpoint_Output": {
         "required": [
           "jobId",
@@ -24606,747 +23823,1122 @@
             "type": "string",
             "description": "The current state of the order."
           },
-          "pipelineId": {
+          "pipelineId": {
+            "type": "string",
+            "description": "The ID of the pipeline associated with the order."
+          },
+          "isLocked": {
+            "type": "boolean",
+            "description": "Whether the order is locked."
+          },
+          "isPublic": {
+            "type": "boolean",
+            "description": "Whether the order is publicly visible."
+          },
+          "failureMessage": {
+            "type": "string",
+            "description": "The failure message if the order failed.",
+            "nullable": true
+          }
+        }
+      },
+      "GetPublicOrdersEndpoint_OrderOutput": {
+        "required": [
+          "id",
+          "name",
+          "isPublic"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "isPublic": {
+            "type": "boolean"
+          }
+        }
+      },
+      "GetPublicOrdersEndpoint_Output": {
+        "required": [
+          "orders"
+        ],
+        "type": "object",
+        "properties": {
+          "orders": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/GetPublicOrdersEndpoint_OrderOutput"
+                }
+              }
+            ],
+            "description": "The list of publicly available orders."
+          }
+        }
+      },
+      "IDatasetModel": {
+        "required": [
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IDatasetModelCloneDatasetModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "CloneDatasetModel": "#/components/schemas/IDatasetModelCloneDatasetModel"
+          }
+        }
+      },
+      "IDatasetModelCloneDatasetModel": {
+        "required": [
+          "datasetToCloneId",
+          "datasetName",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "CloneDatasetModel"
+            ],
+            "type": "string"
+          },
+          "datasetToCloneId": {
+            "type": "string"
+          },
+          "datasetName": {
+            "type": "string"
+          }
+        }
+      },
+      "IOrderWorkflowModel": {
+        "required": [
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel"
+          },
+          {
+            "$ref": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "EvaluationWorkflow": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel",
+            "GroupedRankingWorkflow": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel",
+            "RankingWorkflow": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel",
+            "SimpleWorkflow": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+          }
+        }
+      },
+      "IOrderWorkflowModelEvaluationWorkflowModel": {
+        "required": [
+          "validationSetId",
+          "shouldAcceptIncorrect",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "EvaluationWorkflow"
+            ],
+            "type": "string"
+          },
+          "validationSetId": {
+            "type": "string"
+          },
+          "shouldAcceptIncorrect": {
+            "type": "boolean"
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
+          }
+        }
+      },
+      "IOrderWorkflowModelGroupedRankingWorkflowModel": {
+        "required": [
+          "criteria",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "GroupedRankingWorkflow"
+            ],
+            "type": "string"
+          },
+          "criteria": {
+            "type": "string"
+          },
+          "pairMakerConfig": {
+            "$ref": "#/components/schemas/IPairMakerConfigModel"
+          },
+          "eloConfig": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EloConfigModel"
+              }
+            ],
+            "deprecated": true
+          },
+          "rankingConfig": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IRankingConfigModel"
+              }
+            ]
+          },
+          "contexts": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "contextAssets": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/IAssetInput"
+            },
+            "nullable": true
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
+          },
+          "maxParallelism": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IOrderWorkflowModelRankingWorkflowModel": {
+        "required": [
+          "criteria",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "RankingWorkflow"
+            ],
+            "type": "string"
+          },
+          "criteria": {
+            "type": "string"
+          },
+          "pairMakerConfig": {
+            "$ref": "#/components/schemas/IPairMakerConfigModel"
+          },
+          "eloConfig": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EloConfigModel"
+              }
+            ],
+            "deprecated": true
+          },
+          "rankingConfig": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IRankingConfigModel"
+              }
+            ]
+          },
+          "context": {
             "type": "string",
-            "description": "The ID of the pipeline associated with the order."
+            "nullable": true
           },
-          "isLocked": {
-            "type": "boolean",
-            "description": "Whether the order is locked."
+          "contextAsset": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/IAssetInput"
+              }
+            ]
           },
-          "isPublic": {
-            "type": "boolean",
-            "description": "Whether the order is publicly visible."
+          "metadata": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Metadata_IOrderMetadataInput"
+                },
+                "nullable": true
+              }
+            ],
+            "deprecated": true
           },
-          "failureMessage": {
-            "type": "string",
-            "description": "The failure message if the order failed.",
-            "nullable": true
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
           }
         }
       },
-      "GetPublicOrdersEndpoint_OrderOutput": {
+      "IOrderWorkflowModelSimpleWorkflowModel": {
         "required": [
-          "id",
-          "name",
-          "isPublic"
+          "blueprint",
+          "_t"
         ],
-        "type": "object",
         "properties": {
-          "id": {
+          "_t": {
+            "enum": [
+              "SimpleWorkflow"
+            ],
             "type": "string"
           },
-          "name": {
-            "type": "string"
+          "blueprint": {
+            "$ref": "#/components/schemas/IRapidBlueprint"
           },
-          "isPublic": {
-            "type": "boolean"
+          "batchSize": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "featureFlags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeatureFlag"
+            }
           }
         }
       },
-      "GetPublicOrdersEndpoint_Output": {
+      "IPairMakerConfigModel": {
         "required": [
-          "orders"
+          "_t"
         ],
         "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "OnlinePairMaker": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+          }
+        }
+      },
+      "IPairMakerConfigModelOnlinePairMakerConfigModel": {
+        "required": [
+          "_t"
+        ],
         "properties": {
-          "orders": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/GetPublicOrdersEndpoint_OrderOutput"
-                }
-              }
+          "_t": {
+            "enum": [
+              "OnlinePairMaker"
             ],
-            "description": "The list of publicly available orders."
+            "type": "string"
+          },
+          "randomMatchesRatio": {
+            "type": "number",
+            "format": "float"
+          },
+          "totalComparisonBudget": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IDatasetModel": {
+      "IPipelineArtifactModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IDatasetModelCloneDatasetModel"
+            "$ref": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "CloneDatasetModel": "#/components/schemas/IDatasetModelCloneDatasetModel"
+            "CreateDatasetArtifactModel": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
           }
         }
       },
-      "IDatasetModelCloneDatasetModel": {
+      "IPipelineArtifactModelCreateDatasetArtifactModel": {
         "required": [
-          "datasetToCloneId",
-          "datasetName",
+          "identifier",
+          "dataset",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CloneDatasetModel"
+              "CreateDatasetArtifactModel"
             ],
             "type": "string"
           },
-          "datasetToCloneId": {
+          "identifier": {
             "type": "string"
           },
-          "datasetName": {
-            "type": "string"
+          "dataset": {
+            "$ref": "#/components/schemas/IDatasetModel"
           }
         }
       },
-      "IOrderWorkflowModel": {
+      "IPipelineModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel"
-          },
-          {
-            "$ref": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+            "$ref": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "EvaluationWorkflow": "#/components/schemas/IOrderWorkflowModelEvaluationWorkflowModel",
-            "GroupedRankingWorkflow": "#/components/schemas/IOrderWorkflowModelGroupedRankingWorkflowModel",
-            "RankingWorkflow": "#/components/schemas/IOrderWorkflowModelRankingWorkflowModel",
-            "SimpleWorkflow": "#/components/schemas/IOrderWorkflowModelSimpleWorkflowModel"
+            "CreateSimplePipelineModel": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
           }
         }
       },
-      "IOrderWorkflowModelEvaluationWorkflowModel": {
+      "IPipelineModelCreateSimplePipelineModel": {
         "required": [
-          "validationSetId",
-          "shouldAcceptIncorrect",
+          "artifacts",
+          "pipelineSteps",
+          "namePrefix",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EvaluationWorkflow"
+              "CreateSimplePipelineModel"
             ],
             "type": "string"
           },
-          "validationSetId": {
-            "type": "string"
-          },
-          "shouldAcceptIncorrect": {
-            "type": "boolean"
+          "artifacts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/IPipelineArtifactModel"
+            }
           },
-          "featureFlags": {
+          "pipelineSteps": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
+              "$ref": "#/components/schemas/IPipelineStepModel"
             }
+          },
+          "namePrefix": {
+            "type": "string"
           }
         }
       },
-      "IOrderWorkflowModelGroupedRankingWorkflowModel": {
+      "IPipelineStepModel": {
         "required": [
-          "criteria",
+          "_t"
+        ],
+        "type": "object",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel"
+          },
+          {
+            "$ref": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "_t",
+          "mapping": {
+            "DatasetEvaluationStepModel": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel",
+            "SendCompletionMailStepModel": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel",
+            "WorkflowAggregationStepModel": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel",
+            "WorkflowLabelingStepModel": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          }
+        }
+      },
+      "IPipelineStepModelDatasetEvaluationStepModel": {
+        "required": [
+          "datasetArtifactId",
+          "aggregationResultFileArtifactId",
+          "evaluationResultFileArtifactId",
+          "receiver",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "GroupedRankingWorkflow"
+              "DatasetEvaluationStepModel"
             ],
             "type": "string"
           },
-          "criteria": {
+          "datasetArtifactId": {
             "type": "string"
           },
-          "pairMakerConfig": {
-            "$ref": "#/components/schemas/IPairMakerConfigModel"
-          },
-          "eloConfig": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/EloConfigModel"
-              }
-            ],
-            "deprecated": true
-          },
-          "rankingConfig": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IRankingConfigModel"
-              }
-            ]
-          },
-          "contexts": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            },
-            "nullable": true
-          },
-          "contextAssets": {
-            "type": "object",
-            "additionalProperties": {
-              "$ref": "#/components/schemas/IAssetInput"
-            },
-            "nullable": true
+          "aggregationResultFileArtifactId": {
+            "type": "string"
           },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "evaluationResultFileArtifactId": {
+            "type": "string"
           },
-          "maxParallelism": {
-            "type": "integer",
-            "format": "int32"
+          "receiver": {
+            "type": "string"
           }
         }
       },
-      "IOrderWorkflowModelRankingWorkflowModel": {
+      "IPipelineStepModelSendCompletionMailStepModel": {
         "required": [
-          "criteria",
+          "receiver",
+          "resultsFileArtifactIdentifier",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "RankingWorkflow"
+              "SendCompletionMailStepModel"
             ],
             "type": "string"
           },
-          "criteria": {
+          "receiver": {
             "type": "string"
           },
-          "pairMakerConfig": {
-            "$ref": "#/components/schemas/IPairMakerConfigModel"
-          },
-          "eloConfig": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/EloConfigModel"
-              }
+          "resultsFileArtifactIdentifier": {
+            "type": "string"
+          }
+        }
+      },
+      "IPipelineStepModelWorkflowAggregationStepModel": {
+        "required": [
+          "campaignArtifactId",
+          "workflowArtifactId",
+          "fileArtifactId",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "WorkflowAggregationStepModel"
             ],
-            "deprecated": true
-          },
-          "rankingConfig": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IRankingConfigModel"
-              }
-            ]
+            "type": "string"
           },
-          "context": {
-            "type": "string",
-            "nullable": true
+          "campaignArtifactId": {
+            "type": "string"
           },
-          "contextAsset": {
-            "oneOf": [
-              {
-                "nullable": true
-              },
-              {
-                "$ref": "#/components/schemas/IAssetInput"
-              }
-            ]
+          "workflowArtifactId": {
+            "type": "string"
           },
-          "metadata": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/Metadata_IOrderMetadataInput"
-                },
-                "nullable": true
-              }
-            ],
-            "deprecated": true
+          "fileArtifactId": {
+            "type": "string"
           },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "aggregatorType": {
+            "$ref": "#/components/schemas/AggregatorType"
           }
         }
       },
-      "IOrderWorkflowModelSimpleWorkflowModel": {
+      "IPipelineStepModelWorkflowLabelingStepModel": {
         "required": [
-          "blueprint",
+          "workflowArtifactId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "SimpleWorkflow"
+              "WorkflowLabelingStepModel"
             ],
             "type": "string"
           },
-          "blueprint": {
-            "$ref": "#/components/schemas/IRapidBlueprint"
-          },
-          "batchSize": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "featureFlags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FeatureFlag"
-            }
+          "workflowArtifactId": {
+            "type": "string"
           }
         }
       },
-      "IPairMakerConfigModel": {
+      "IRankingConfigModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+            "$ref": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRankingConfigModelEloConfigModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "OnlinePairMaker": "#/components/schemas/IPairMakerConfigModelOnlinePairMakerConfigModel"
+            "BradleyTerryRankingConfig": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel",
+            "EloConfig": "#/components/schemas/IRankingConfigModelEloConfigModel"
           }
         }
       },
-      "IPairMakerConfigModelOnlinePairMakerConfigModel": {
+      "IRankingConfigModelBradleyTerryRankingConfigModel": {
         "required": [
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "OnlinePairMaker"
+              "BradleyTerryRankingConfig"
             ],
             "type": "string"
           },
-          "randomMatchesRatio": {
-            "type": "number",
-            "format": "float"
+          "startingScore": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IRankingConfigModelEloConfigModel": {
+        "required": [
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "EloConfig"
+            ],
+            "type": "string"
           },
-          "totalComparisonBudget": {
+          "startingElo": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "kFactor": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "scalingFactor": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IPipelineArtifactModel": {
+      "IRapidBlueprint": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
+            "$ref": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintLineRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint"
+          },
+          {
+            "$ref": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "CreateDatasetArtifactModel": "#/components/schemas/IPipelineArtifactModelCreateDatasetArtifactModel"
+            "TranscriptionBlueprint": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint",
+            "ScrubBlueprint": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint",
+            "PolygonBlueprint": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint",
+            "NamedEntityBlueprint": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint",
+            "LocateBlueprint": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint",
+            "LineBlueprint": "#/components/schemas/IRapidBlueprintLineRapidBlueprint",
+            "FreeTextBlueprint": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint",
+            "CompareBlueprint": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint",
+            "ClassifyBlueprint": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint",
+            "BoundingBoxBlueprint": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
           }
         }
       },
-      "IPipelineArtifactModelCreateDatasetArtifactModel": {
+      "IRapidBlueprintAttachCategoryRapidBlueprint": {
         "required": [
-          "identifier",
-          "dataset",
+          "title",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CreateDatasetArtifactModel"
+              "ClassifyBlueprint"
             ],
             "type": "string"
           },
-          "identifier": {
-            "type": "string"
+          "possibleCategories": {
+            "allOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            ],
+            "deprecated": true
           },
-          "dataset": {
-            "$ref": "#/components/schemas/IDatasetModel"
+          "categories": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AttachCategoryRapidBlueprint_Category"
+            }
+          },
+          "title": {
+            "type": "string"
           }
         }
       },
-      "IPipelineModel": {
+      "IRapidBlueprintBoundingBoxRapidBlueprint": {
         "required": [
+          "target",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "CreateSimplePipelineModel": "#/components/schemas/IPipelineModelCreateSimplePipelineModel"
+        "properties": {
+          "_t": {
+            "enum": [
+              "BoundingBoxBlueprint"
+            ],
+            "type": "string"
+          },
+          "target": {
+            "type": "string"
           }
         }
       },
-      "IPipelineModelCreateSimplePipelineModel": {
+      "IRapidBlueprintCompareRapidBlueprint": {
         "required": [
-          "artifacts",
-          "pipelineSteps",
-          "namePrefix",
+          "criteria",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CreateSimplePipelineModel"
+              "CompareBlueprint"
             ],
             "type": "string"
           },
-          "artifacts": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IPipelineArtifactModel"
-            }
+          "criteria": {
+            "type": "string"
           },
-          "pipelineSteps": {
+          "indexIdentifiers": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/IPipelineStepModel"
+              "type": "string"
             }
-          },
-          "namePrefix": {
-            "type": "string"
           }
         }
       },
-      "IPipelineStepModel": {
+      "IRapidBlueprintFreeTextRapidBlueprint": {
         "required": [
+          "question",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel"
+        "properties": {
+          "_t": {
+            "enum": [
+              "FreeTextBlueprint"
+            ],
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel"
+          "question": {
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel"
+          "shouldValidateResponse": {
+            "type": "boolean"
           },
-          {
-            "$ref": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "DatasetEvaluationStepModel": "#/components/schemas/IPipelineStepModelDatasetEvaluationStepModel",
-            "SendCompletionMailStepModel": "#/components/schemas/IPipelineStepModelSendCompletionMailStepModel",
-            "WorkflowAggregationStepModel": "#/components/schemas/IPipelineStepModelWorkflowAggregationStepModel",
-            "WorkflowLabelingStepModel": "#/components/schemas/IPipelineStepModelWorkflowLabelingStepModel"
+          "validationSystemPrompt": {
+            "type": "string",
+            "nullable": true
           }
         }
       },
-      "IPipelineStepModelDatasetEvaluationStepModel": {
+      "IRapidBlueprintLineRapidBlueprint": {
         "required": [
-          "datasetArtifactId",
-          "aggregationResultFileArtifactId",
-          "evaluationResultFileArtifactId",
-          "receiver",
+          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DatasetEvaluationStepModel"
+              "LineBlueprint"
             ],
             "type": "string"
           },
-          "datasetArtifactId": {
-            "type": "string"
-          },
-          "aggregationResultFileArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "evaluationResultFileArtifactId": {
+          }
+        }
+      },
+      "IRapidBlueprintLocateRapidBlueprint": {
+        "required": [
+          "target",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "LocateBlueprint"
+            ],
             "type": "string"
           },
-          "receiver": {
+          "target": {
             "type": "string"
           }
         }
       },
-      "IPipelineStepModelSendCompletionMailStepModel": {
+      "IRapidBlueprintNamedEntityRapidBlueprint": {
         "required": [
-          "receiver",
-          "resultsFileArtifactIdentifier",
+          "target",
+          "classes",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "SendCompletionMailStepModel"
+              "NamedEntityBlueprint"
             ],
             "type": "string"
           },
-          "receiver": {
+          "target": {
             "type": "string"
           },
-          "resultsFileArtifactIdentifier": {
-            "type": "string"
+          "classes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "IPipelineStepModelWorkflowAggregationStepModel": {
+      "IRapidBlueprintPolygonRapidBlueprint": {
         "required": [
-          "campaignArtifactId",
-          "workflowArtifactId",
-          "fileArtifactId",
+          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "WorkflowAggregationStepModel"
+              "PolygonBlueprint"
             ],
             "type": "string"
           },
-          "campaignArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "workflowArtifactId": {
+          }
+        }
+      },
+      "IRapidBlueprintScrubRapidBlueprint": {
+        "required": [
+          "target",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "ScrubBlueprint"
+            ],
             "type": "string"
           },
-          "fileArtifactId": {
+          "target": {
             "type": "string"
-          },
-          "aggregatorType": {
-            "$ref": "#/components/schemas/AggregatorType"
           }
         }
       },
-      "IPipelineStepModelWorkflowLabelingStepModel": {
+      "IRapidBlueprintTranscriptionRapidBlueprint": {
         "required": [
-          "workflowArtifactId",
+          "title",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "WorkflowLabelingStepModel"
+              "TranscriptionBlueprint"
             ],
             "type": "string"
           },
-          "workflowArtifactId": {
+          "title": {
             "type": "string"
           }
         }
       },
-      "IRankingConfigModel": {
+      "IRefereeModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel"
+            "$ref": "#/components/schemas/IRefereeModelBudgetRefereeModel"
           },
           {
-            "$ref": "#/components/schemas/IRankingConfigModelEloConfigModel"
+            "$ref": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRefereeModelNaiveRefereeModel"
+          },
+          {
+            "$ref": "#/components/schemas/IRefereeModelQuorumRefereeModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "BradleyTerryRankingConfig": "#/components/schemas/IRankingConfigModelBradleyTerryRankingConfigModel",
-            "EloConfig": "#/components/schemas/IRankingConfigModelEloConfigModel"
+            "BudgetReferee": "#/components/schemas/IRefereeModelBudgetRefereeModel",
+            "EarlyStoppingReferee": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel",
+            "NaiveReferee": "#/components/schemas/IRefereeModelNaiveRefereeModel",
+            "QuorumReferee": "#/components/schemas/IRefereeModelQuorumRefereeModel"
           }
         }
       },
-      "IRankingConfigModelBradleyTerryRankingConfigModel": {
+      "IRefereeModelBudgetRefereeModel": {
         "required": [
+          "totalBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "BradleyTerryRankingConfig"
+              "BudgetReferee"
             ],
             "type": "string"
           },
-          "startingScore": {
+          "totalBudget": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IRankingConfigModelEloConfigModel": {
+      "IRefereeModelEarlyStoppingRefereeModel": {
         "required": [
+          "maxVotes",
+          "threshold",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EloConfig"
+              "EarlyStoppingReferee"
             ],
             "type": "string"
           },
-          "startingElo": {
+          "maxVotes": {
             "type": "integer",
             "format": "int32"
           },
-          "kFactor": {
+          "threshold": {
+            "type": "number",
+            "format": "double"
+          }
+        }
+      },
+      "IRefereeModelNaiveRefereeModel": {
+        "required": [
+          "totalVotes",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "NaiveReferee"
+            ],
+            "type": "string"
+          },
+          "totalVotes": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "IRefereeModelQuorumRefereeModel": {
+        "required": [
+          "maxVotes",
+          "threshold",
+          "_t"
+        ],
+        "properties": {
+          "_t": {
+            "enum": [
+              "QuorumReferee"
+            ],
+            "type": "string"
+          },
+          "maxVotes": {
             "type": "integer",
             "format": "int32"
           },
-          "scalingFactor": {
+          "threshold": {
             "type": "integer",
             "format": "int32"
           }
         }
       },
-      "IRapidBlueprint": {
+      "ISelection": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint"
-          },
-          {
-            "$ref": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionAbTestSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionCappedSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionConditionalValidationSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionDemographicSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintLineRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionEffortCappedSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionLabelingSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionShufflingSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionStaticSelection"
           },
           {
-            "$ref": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
+            "$ref": "#/components/schemas/ISelectionValidationSelection"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "TranscriptionBlueprint": "#/components/schemas/IRapidBlueprintTranscriptionRapidBlueprint",
-            "ScrubBlueprint": "#/components/schemas/IRapidBlueprintScrubRapidBlueprint",
-            "PolygonBlueprint": "#/components/schemas/IRapidBlueprintPolygonRapidBlueprint",
-            "NamedEntityBlueprint": "#/components/schemas/IRapidBlueprintNamedEntityRapidBlueprint",
-            "LocateBlueprint": "#/components/schemas/IRapidBlueprintLocateRapidBlueprint",
-            "LineBlueprint": "#/components/schemas/IRapidBlueprintLineRapidBlueprint",
-            "FreeTextBlueprint": "#/components/schemas/IRapidBlueprintFreeTextRapidBlueprint",
-            "CompareBlueprint": "#/components/schemas/IRapidBlueprintCompareRapidBlueprint",
-            "ClassifyBlueprint": "#/components/schemas/IRapidBlueprintAttachCategoryRapidBlueprint",
-            "BoundingBoxBlueprint": "#/components/schemas/IRapidBlueprintBoundingBoxRapidBlueprint"
+            "AbTestSelection": "#/components/schemas/ISelectionAbTestSelection",
+            "CappedSelection": "#/components/schemas/ISelectionCappedSelection",
+            "ConditionalValidationSelection": "#/components/schemas/ISelectionConditionalValidationSelection",
+            "DemographicSelection": "#/components/schemas/ISelectionDemographicSelection",
+            "EffortCappedSelection": "#/components/schemas/ISelectionEffortCappedSelection",
+            "LabelingSelection": "#/components/schemas/ISelectionLabelingSelection",
+            "ShufflingSelection": "#/components/schemas/ISelectionShufflingSelection",
+            "StaticSelection": "#/components/schemas/ISelectionStaticSelection",
+            "ValidationSelection": "#/components/schemas/ISelectionValidationSelection"
           }
         }
       },
-      "IRapidBlueprintAttachCategoryRapidBlueprint": {
+      "ISelectionAbTestSelection": {
         "required": [
-          "title",
+          "a",
+          "b",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ClassifyBlueprint"
+              "AbTestSelection"
             ],
             "type": "string"
           },
-          "possibleCategories": {
-            "allOf": [
-              {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            ],
-            "deprecated": true
-          },
-          "categories": {
+          "a": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/AttachCategoryRapidBlueprint_Category"
+              "$ref": "#/components/schemas/ISelection"
             }
           },
-          "title": {
-            "type": "string"
+          "b": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ISelection"
+            }
           }
         }
       },
-      "IRapidBlueprintBoundingBoxRapidBlueprint": {
+      "ISelectionCappedSelection": {
         "required": [
-          "target",
+          "selections",
+          "maxRapids",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "BoundingBoxBlueprint"
+              "CappedSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "selections": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ISelection"
+            }
+          },
+          "maxRapids": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintCompareRapidBlueprint": {
+      "ISelectionConditionalValidationSelection": {
         "required": [
-          "criteria",
+          "validationSetId",
+          "validationChances",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CompareBlueprint"
+              "ConditionalValidationSelection"
             ],
             "type": "string"
           },
-          "criteria": {
+          "validationSetId": {
             "type": "string"
           },
-          "indexIdentifiers": {
+          "validationChances": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConditionalValidationSelection_ValidationChance"
+            }
+          },
+          "dimensions": {
             "type": "array",
             "items": {
               "type": "string"
@@ -25354,517 +24946,472 @@
           }
         }
       },
-      "IRapidBlueprintFreeTextRapidBlueprint": {
+      "ISelectionDemographicSelection": {
         "required": [
-          "question",
+          "keys",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "FreeTextBlueprint"
+              "DemographicSelection"
             ],
             "type": "string"
           },
-          "question": {
-            "type": "string"
-          },
-          "shouldValidateResponse": {
-            "type": "boolean"
+          "keys": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           },
-          "validationSystemPrompt": {
-            "type": "string",
-            "nullable": true
+          "maxRapids": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintLineRapidBlueprint": {
+      "ISelectionEffortCappedSelection": {
         "required": [
-          "target",
+          "effortBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LineBlueprint"
+              "EffortCappedSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "effortBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "retrievalMode": {
+            "$ref": "#/components/schemas/RetrievalMode"
+          },
+          "maxIterations": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintLocateRapidBlueprint": {
+      "ISelectionLabelingSelection": {
         "required": [
-          "target",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LocateBlueprint"
+              "LabelingSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "amount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "effortBudget": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "retrievalMode": {
+            "$ref": "#/components/schemas/RetrievalMode"
+          },
+          "maxIterations": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },
-      "IRapidBlueprintNamedEntityRapidBlueprint": {
+      "ISelectionShufflingSelection": {
         "required": [
-          "target",
-          "classes",
+          "selections",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NamedEntityBlueprint"
+              "ShufflingSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
-          },
-          "classes": {
+          "selections": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/ISelection"
             }
           }
         }
       },
-      "IRapidBlueprintPolygonRapidBlueprint": {
+      "ISelectionStaticSelection": {
         "required": [
-          "target",
+          "rapidIds",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "PolygonBlueprint"
+              "StaticSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
+          "rapidIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "IRapidBlueprintScrubRapidBlueprint": {
+      "ISelectionValidationSelection": {
         "required": [
-          "target",
+          "amount",
+          "validationSetId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ScrubBlueprint"
+              "ValidationSelection"
             ],
             "type": "string"
           },
-          "target": {
-            "type": "string"
-          }
-        }
-      },
-      "IRapidBlueprintTranscriptionRapidBlueprint": {
-        "required": [
-          "title",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "TranscriptionBlueprint"
-            ],
-            "type": "string"
+          "amount": {
+            "type": "integer",
+            "format": "int32"
           },
-          "title": {
+          "validationSetId": {
             "type": "string"
           }
         }
       },
-      "IRefereeModel": {
+      "IUserFilterModel": {
         "required": [
           "_t"
         ],
         "type": "object",
         "oneOf": [
           {
-            "$ref": "#/components/schemas/IRefereeModelBudgetRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelAgeUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelAndUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelNaiveRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelCampaignUserFilterModel"
           },
           {
-            "$ref": "#/components/schemas/IRefereeModelQuorumRefereeModel"
+            "$ref": "#/components/schemas/IUserFilterModelCountryUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelCustomUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelDeviceUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelGenderUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelLanguageUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelNewUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelNotUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelOrUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel"
+          },
+          {
+            "$ref": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
           }
         ],
         "discriminator": {
           "propertyName": "_t",
           "mapping": {
-            "BudgetReferee": "#/components/schemas/IRefereeModelBudgetRefereeModel",
-            "EarlyStoppingReferee": "#/components/schemas/IRefereeModelEarlyStoppingRefereeModel",
-            "NaiveReferee": "#/components/schemas/IRefereeModelNaiveRefereeModel",
-            "QuorumReferee": "#/components/schemas/IRefereeModelQuorumRefereeModel"
-          }
-        }
-      },
-      "IRefereeModelBudgetRefereeModel": {
-        "required": [
-          "totalBudget",
-          "_t"
-        ],
-        "properties": {
-          "_t": {
-            "enum": [
-              "BudgetReferee"
-            ],
-            "type": "string"
-          },
-          "totalBudget": {
-            "type": "integer",
-            "format": "int32"
+            "AgeFilter": "#/components/schemas/IUserFilterModelAgeUserFilterModel",
+            "AndFilter": "#/components/schemas/IUserFilterModelAndUserFilterModel",
+            "CampaignFilter": "#/components/schemas/IUserFilterModelCampaignUserFilterModel",
+            "CountryFilter": "#/components/schemas/IUserFilterModelCountryUserFilterModel",
+            "CustomFilter": "#/components/schemas/IUserFilterModelCustomUserFilterModel",
+            "DeviceFilter": "#/components/schemas/IUserFilterModelDeviceUserFilterModel",
+            "GenderFilter": "#/components/schemas/IUserFilterModelGenderUserFilterModel",
+            "LanguageFilter": "#/components/schemas/IUserFilterModelLanguageUserFilterModel",
+            "NewUserFilter": "#/components/schemas/IUserFilterModelNewUserFilterModel",
+            "NotFilter": "#/components/schemas/IUserFilterModelNotUserFilterModel",
+            "OrFilter": "#/components/schemas/IUserFilterModelOrUserFilterModel",
+            "ResponseCountFilter": "#/components/schemas/IUserFilterModelResponseCountUserFilterModel",
+            "UserScoreFilter": "#/components/schemas/IUserFilterModelUserScoreUserFilterModel"
           }
         }
       },
-      "IRefereeModelEarlyStoppingRefereeModel": {
+      "IUserFilterModelAgeUserFilterModel": {
         "required": [
-          "maxVotes",
-          "threshold",
+          "ageGroups",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EarlyStoppingReferee"
+              "AgeFilter"
             ],
             "type": "string"
           },
-          "maxVotes": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "threshold": {
-            "type": "number",
-            "format": "double"
+          "ageGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgeUserFilterModel_AgeGroup"
+            }
           }
         }
       },
-      "IRefereeModelNaiveRefereeModel": {
+      "IUserFilterModelAndUserFilterModel": {
         "required": [
-          "totalVotes",
+          "filters",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "NaiveReferee"
+              "AndFilter"
             ],
             "type": "string"
           },
-          "totalVotes": {
-            "type": "integer",
-            "format": "int32"
+          "filters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/IUserFilterModel"
+            }
           }
         }
       },
-      "IRefereeModelQuorumRefereeModel": {
+      "IUserFilterModelCampaignUserFilterModel": {
         "required": [
-          "maxVotes",
-          "threshold",
+          "campaignIds",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "QuorumReferee"
+              "CampaignFilter"
             ],
             "type": "string"
           },
-          "maxVotes": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "threshold": {
-            "type": "integer",
-            "format": "int32"
+          "campaignIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "ISelection": {
+      "IUserFilterModelCountryUserFilterModel": {
         "required": [
+          "countries",
           "_t"
         ],
-        "type": "object",
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/ISelectionAbTestSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionCappedSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionConditionalValidationSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionDemographicSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionEffortCappedSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionLabelingSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionShufflingSelection"
-          },
-          {
-            "$ref": "#/components/schemas/ISelectionStaticSelection"
+        "properties": {
+          "_t": {
+            "enum": [
+              "CountryFilter"
+            ],
+            "type": "string"
           },
-          {
-            "$ref": "#/components/schemas/ISelectionValidationSelection"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "_t",
-          "mapping": {
-            "AbTestSelection": "#/components/schemas/ISelectionAbTestSelection",
-            "CappedSelection": "#/components/schemas/ISelectionCappedSelection",
-            "ConditionalValidationSelection": "#/components/schemas/ISelectionConditionalValidationSelection",
-            "DemographicSelection": "#/components/schemas/ISelectionDemographicSelection",
-            "EffortCappedSelection": "#/components/schemas/ISelectionEffortCappedSelection",
-            "LabelingSelection": "#/components/schemas/ISelectionLabelingSelection",
-            "ShufflingSelection": "#/components/schemas/ISelectionShufflingSelection",
-            "StaticSelection": "#/components/schemas/ISelectionStaticSelection",
-            "ValidationSelection": "#/components/schemas/ISelectionValidationSelection"
+          "countries": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "ISelectionAbTestSelection": {
+      "IUserFilterModelCustomUserFilterModel": {
         "required": [
-          "a",
-          "b",
+          "identifier",
+          "values",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "AbTestSelection"
+              "CustomFilter"
             ],
             "type": "string"
           },
-          "a": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ISelection"
-            }
+          "identifier": {
+            "type": "string"
           },
-          "b": {
+          "values": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "type": "string"
             }
           }
         }
       },
-      "ISelectionCappedSelection": {
+      "IUserFilterModelDeviceUserFilterModel": {
         "required": [
-          "selections",
-          "maxRapids",
+          "deviceTypes",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "CappedSelection"
+              "DeviceFilter"
             ],
             "type": "string"
           },
-          "selections": {
+          "deviceTypes": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "$ref": "#/components/schemas/DeviceType"
             }
-          },
-          "maxRapids": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionConditionalValidationSelection": {
+      "IUserFilterModelGenderUserFilterModel": {
         "required": [
-          "validationSetId",
-          "validationChances",
+          "genders",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ConditionalValidationSelection"
+              "GenderFilter"
             ],
             "type": "string"
           },
-          "validationSetId": {
-            "type": "string"
-          },
-          "validationChances": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ConditionalValidationSelection_ValidationChance"
-            }
-          },
-          "dimensions": {
+          "genders": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/GenderUserFilterModel_Gender"
             }
           }
         }
       },
-      "ISelectionDemographicSelection": {
+      "IUserFilterModelLanguageUserFilterModel": {
         "required": [
-          "keys",
+          "languages",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "DemographicSelection"
+              "LanguageFilter"
             ],
             "type": "string"
           },
-          "keys": {
+          "languages": {
             "type": "array",
             "items": {
               "type": "string"
             }
-          },
-          "maxRapids": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionEffortCappedSelection": {
+      "IUserFilterModelNewUserFilterModel": {
         "required": [
-          "effortBudget",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "EffortCappedSelection"
+              "NewUserFilter"
             ],
             "type": "string"
-          },
-          "effortBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "retrievalMode": {
-            "$ref": "#/components/schemas/RetrievalMode"
-          },
-          "maxIterations": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },
-      "ISelectionLabelingSelection": {
+      "IUserFilterModelNotUserFilterModel": {
         "required": [
+          "filter",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "LabelingSelection"
+              "NotFilter"
             ],
             "type": "string"
           },
-          "amount": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "effortBudget": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "retrievalMode": {
-            "$ref": "#/components/schemas/RetrievalMode"
-          },
-          "maxIterations": {
-            "type": "integer",
-            "format": "int32"
+          "filter": {
+            "$ref": "#/components/schemas/IUserFilterModel"
           }
         }
       },
-      "ISelectionShufflingSelection": {
+      "IUserFilterModelOrUserFilterModel": {
         "required": [
-          "selections",
+          "filters",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ShufflingSelection"
+              "OrFilter"
             ],
             "type": "string"
           },
-          "selections": {
+          "filters": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/ISelection"
+              "$ref": "#/components/schemas/IUserFilterModel"
             }
           }
         }
       },
-      "ISelectionStaticSelection": {
+      "IUserFilterModelResponseCountUserFilterModel": {
         "required": [
-          "rapidIds",
+          "responseCount",
+          "dimension",
+          "operator",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "StaticSelection"
+              "ResponseCountFilter"
             ],
             "type": "string"
           },
-          "rapidIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "responseCount": {
+            "type": "integer",
+            "format": "uint32"
+          },
+          "dimension": {
+            "type": "string"
+          },
+          "operator": {
+            "$ref": "#/components/schemas/ComparisonOperator"
           }
         }
       },
-      "ISelectionValidationSelection": {
+      "IUserFilterModelUserScoreUserFilterModel": {
         "required": [
-          "amount",
-          "validationSetId",
           "_t"
         ],
         "properties": {
           "_t": {
             "enum": [
-              "ValidationSelection"
+              "UserScoreFilter"
             ],
             "type": "string"
           },
-          "amount": {
-            "type": "integer",
-            "format": "int32"
+          "lowerbound": {
+            "type": "number",
+            "format": "double"
           },
-          "validationSetId": {
-            "type": "string"
+          "upperbound": {
+            "type": "number",
+            "format": "double"
+          },
+          "dimension": {
+            "type": "string",
+            "nullable": true
           }
         }
       },
diff --git a/src/rapidata/api_client/models/create_leaderboard_model.py b/src/rapidata/api_client/models/create_leaderboard_model.py
index dd202ec9..32853a2d 100644
--- a/src/rapidata/api_client/models/create_leaderboard_model.py
+++ b/src/rapidata/api_client/models/create_leaderboard_model.py
@@ -20,7 +20,6 @@
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from rapidata.api_client.models.feature_flag import FeatureFlag
-from rapidata.api_client.models.i_user_filter_model import IUserFilterModel
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -37,11 +36,9 @@ class CreateLeaderboardModel(BaseModel):
     response_budget: Optional[StrictInt] = Field(default=None, description="Total amount of responses that get collected per run", alias="responseBudget")
     min_responses: Optional[StrictInt] = Field(default=None, description="The minimum amount of responses that need to be collected per comparison.", alias="minResponses")
     is_inversed: Optional[StrictBool] = Field(default=None, description="If the results should be inversed, meaning people should select the worse model.", alias="isInversed")
-    validation_set_id: Optional[StrictStr] = Field(default=None, description="The Validation set that should be attached to every run.", alias="validationSetId")
-    audience_id: Optional[StrictStr] = Field(default=None, description="Optional audience ID. When provided, the leaderboard will target users who have  graduated from the audience (i.e., users with a score at or above the audience's minimum threshold).  Cannot be specified together with Filters.", alias="audienceId")
-    filters: Optional[List[IUserFilterModel]] = None
+    audience_id: Optional[StrictStr] = Field(default=None, description="Optional audience ID. When provided, evaluations run on the specified audience.  Defaults to the global audience when not specified.", alias="audienceId")
     feature_flags: Optional[List[FeatureFlag]] = Field(default=None, alias="featureFlags")
-    __properties: ClassVar[List[str]] = ["benchmarkId", "benchmarkName", "name", "instruction", "showPrompt", "showPromptAsset", "responseBudget", "minResponses", "isInversed", "validationSetId", "audienceId", "filters", "featureFlags"]
+    __properties: ClassVar[List[str]] = ["benchmarkId", "benchmarkName", "name", "instruction", "showPrompt", "showPromptAsset", "responseBudget", "minResponses", "isInversed", "audienceId", "featureFlags"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -82,13 +79,6 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in filters (list)
-        _items = []
-        if self.filters:
-            for _item_filters in self.filters:
-                if _item_filters:
-                    _items.append(_item_filters.to_dict())
-            _dict['filters'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in feature_flags (list)
         _items = []
         if self.feature_flags:
@@ -106,21 +96,11 @@ def to_dict(self) -> Dict[str, Any]:
         if self.benchmark_name is None and "benchmark_name" in self.model_fields_set:
             _dict['benchmarkName'] = None
 
-        # set to None if validation_set_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.validation_set_id is None and "validation_set_id" in self.model_fields_set:
-            _dict['validationSetId'] = None
-
         # set to None if audience_id (nullable) is None
         # and model_fields_set contains the field
         if self.audience_id is None and "audience_id" in self.model_fields_set:
             _dict['audienceId'] = None
 
-        # set to None if filters (nullable) is None
-        # and model_fields_set contains the field
-        if self.filters is None and "filters" in self.model_fields_set:
-            _dict['filters'] = None
-
         # set to None if feature_flags (nullable) is None
         # and model_fields_set contains the field
         if self.feature_flags is None and "feature_flags" in self.model_fields_set:
@@ -147,9 +127,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "responseBudget": obj.get("responseBudget"),
             "minResponses": obj.get("minResponses"),
             "isInversed": obj.get("isInversed"),
-            "validationSetId": obj.get("validationSetId"),
             "audienceId": obj.get("audienceId"),
-            "filters": [IUserFilterModel.from_dict(_item) for _item in obj["filters"]] if obj.get("filters") is not None else None,
             "featureFlags": [FeatureFlag.from_dict(_item) for _item in obj["featureFlags"]] if obj.get("featureFlags") is not None else None
         })
         return _obj
diff --git a/src/rapidata/api_client/models/get_leaderboard_by_id_result.py b/src/rapidata/api_client/models/get_leaderboard_by_id_result.py
index 95d53474..d4204f40 100644
--- a/src/rapidata/api_client/models/get_leaderboard_by_id_result.py
+++ b/src/rapidata/api_client/models/get_leaderboard_by_id_result.py
@@ -20,7 +20,6 @@
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from rapidata.api_client.models.feature_flag import FeatureFlag
-from rapidata.api_client.models.i_campaign_filter import ICampaignFilter
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -29,7 +28,6 @@ class GetLeaderboardByIdResult(BaseModel):
     GetLeaderboardByIdResult
     """ # noqa: E501
     id: StrictStr
-    order_id: Optional[StrictStr] = Field(default=None, alias="orderId")
     name: StrictStr
     instruction: StrictStr
     show_prompt: StrictBool = Field(alias="showPrompt")
@@ -37,10 +35,10 @@ class GetLeaderboardByIdResult(BaseModel):
     is_inversed: StrictBool = Field(alias="isInversed")
     response_budget: StrictInt = Field(alias="responseBudget")
     min_responses: StrictInt = Field(alias="minResponses")
-    validation_set_id: Optional[StrictStr] = Field(default=None, alias="validationSetId")
-    filters: List[ICampaignFilter]
+    audience_id: StrictStr = Field(alias="audienceId")
+    job_definition_id: Optional[StrictStr] = Field(default=None, alias="jobDefinitionId")
     feature_flags: List[FeatureFlag] = Field(alias="featureFlags")
-    __properties: ClassVar[List[str]] = ["id", "orderId", "name", "instruction", "showPrompt", "showPromptAsset", "isInversed", "responseBudget", "minResponses", "validationSetId", "filters", "featureFlags"]
+    __properties: ClassVar[List[str]] = ["id", "name", "instruction", "showPrompt", "showPromptAsset", "isInversed", "responseBudget", "minResponses", "audienceId", "jobDefinitionId", "featureFlags"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -81,13 +79,6 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in filters (list)
-        _items = []
-        if self.filters:
-            for _item_filters in self.filters:
-                if _item_filters:
-                    _items.append(_item_filters.to_dict())
-            _dict['filters'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in feature_flags (list)
         _items = []
         if self.feature_flags:
@@ -95,15 +86,10 @@ def to_dict(self) -> Dict[str, Any]:
                 if _item_feature_flags:
                     _items.append(_item_feature_flags.to_dict())
             _dict['featureFlags'] = _items
-        # set to None if order_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.order_id is None and "order_id" in self.model_fields_set:
-            _dict['orderId'] = None
-
-        # set to None if validation_set_id (nullable) is None
+        # set to None if job_definition_id (nullable) is None
         # and model_fields_set contains the field
-        if self.validation_set_id is None and "validation_set_id" in self.model_fields_set:
-            _dict['validationSetId'] = None
+        if self.job_definition_id is None and "job_definition_id" in self.model_fields_set:
+            _dict['jobDefinitionId'] = None
 
         return _dict
 
@@ -118,7 +104,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
-            "orderId": obj.get("orderId"),
             "name": obj.get("name"),
             "instruction": obj.get("instruction"),
             "showPrompt": obj.get("showPrompt"),
@@ -126,8 +111,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "isInversed": obj.get("isInversed"),
             "responseBudget": obj.get("responseBudget"),
             "minResponses": obj.get("minResponses"),
-            "validationSetId": obj.get("validationSetId"),
-            "filters": [ICampaignFilter.from_dict(_item) for _item in obj["filters"]] if obj.get("filters") is not None else None,
+            "audienceId": obj.get("audienceId"),
+            "jobDefinitionId": obj.get("jobDefinitionId"),
             "featureFlags": [FeatureFlag.from_dict(_item) for _item in obj["featureFlags"]] if obj.get("featureFlags") is not None else None
         })
         return _obj
diff --git a/src/rapidata/api_client/models/leaderboards_query_result.py b/src/rapidata/api_client/models/leaderboards_query_result.py
index 796f7eee..5df6f258 100644
--- a/src/rapidata/api_client/models/leaderboards_query_result.py
+++ b/src/rapidata/api_client/models/leaderboards_query_result.py
@@ -20,7 +20,6 @@
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from rapidata.api_client.models.feature_flag import FeatureFlag
-from rapidata.api_client.models.i_campaign_filter import ICampaignFilter
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -29,7 +28,6 @@ class LeaderboardsQueryResult(BaseModel):
     LeaderboardsQueryResult
     """ # noqa: E501
     id: StrictStr
-    order_id: Optional[StrictStr] = Field(default=None, alias="orderId")
     name: StrictStr
     instruction: StrictStr
     show_prompt: StrictBool = Field(alias="showPrompt")
@@ -37,10 +35,10 @@ class LeaderboardsQueryResult(BaseModel):
     is_inversed: StrictBool = Field(alias="isInversed")
     response_budget: StrictInt = Field(alias="responseBudget")
     min_responses: StrictInt = Field(alias="minResponses")
-    validation_set_id: Optional[StrictStr] = Field(default=None, alias="validationSetId")
-    filters: List[ICampaignFilter]
+    audience_id: StrictStr = Field(alias="audienceId")
+    job_definition_id: Optional[StrictStr] = Field(default=None, alias="jobDefinitionId")
     feature_flags: List[FeatureFlag] = Field(alias="featureFlags")
-    __properties: ClassVar[List[str]] = ["id", "orderId", "name", "instruction", "showPrompt", "showPromptAsset", "isInversed", "responseBudget", "minResponses", "validationSetId", "filters", "featureFlags"]
+    __properties: ClassVar[List[str]] = ["id", "name", "instruction", "showPrompt", "showPromptAsset", "isInversed", "responseBudget", "minResponses", "audienceId", "jobDefinitionId", "featureFlags"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -81,13 +79,6 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in filters (list)
-        _items = []
-        if self.filters:
-            for _item_filters in self.filters:
-                if _item_filters:
-                    _items.append(_item_filters.to_dict())
-            _dict['filters'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in feature_flags (list)
         _items = []
         if self.feature_flags:
@@ -95,15 +86,10 @@ def to_dict(self) -> Dict[str, Any]:
                 if _item_feature_flags:
                     _items.append(_item_feature_flags.to_dict())
             _dict['featureFlags'] = _items
-        # set to None if order_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.order_id is None and "order_id" in self.model_fields_set:
-            _dict['orderId'] = None
-
-        # set to None if validation_set_id (nullable) is None
+        # set to None if job_definition_id (nullable) is None
         # and model_fields_set contains the field
-        if self.validation_set_id is None and "validation_set_id" in self.model_fields_set:
-            _dict['validationSetId'] = None
+        if self.job_definition_id is None and "job_definition_id" in self.model_fields_set:
+            _dict['jobDefinitionId'] = None
 
         return _dict
 
@@ -118,7 +104,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
-            "orderId": obj.get("orderId"),
             "name": obj.get("name"),
             "instruction": obj.get("instruction"),
             "showPrompt": obj.get("showPrompt"),
@@ -126,8 +111,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "isInversed": obj.get("isInversed"),
             "responseBudget": obj.get("responseBudget"),
             "minResponses": obj.get("minResponses"),
-            "validationSetId": obj.get("validationSetId"),
-            "filters": [ICampaignFilter.from_dict(_item) for _item in obj["filters"]] if obj.get("filters") is not None else None,
+            "audienceId": obj.get("audienceId"),
+            "jobDefinitionId": obj.get("jobDefinitionId"),
             "featureFlags": [FeatureFlag.from_dict(_item) for _item in obj["featureFlags"]] if obj.get("featureFlags") is not None else None
         })
         return _obj
diff --git a/src/rapidata/api_client_README.md b/src/rapidata/api_client_README.md
index 887810ad..990357ba 100644
--- a/src/rapidata/api_client_README.md
+++ b/src/rapidata/api_client_README.md
@@ -471,15 +471,6 @@ Class | Method | HTTP request | Description
  - [IAudienceFilterLanguageAudienceFilter](rapidata/api_client/docs/IAudienceFilterLanguageAudienceFilter.md)
  - [IAudienceFilterNotAudienceFilter](rapidata/api_client/docs/IAudienceFilterNotAudienceFilter.md)
  - [IAudienceFilterOrAudienceFilter](rapidata/api_client/docs/IAudienceFilterOrAudienceFilter.md)
- - [ICampaignFilter](rapidata/api_client/docs/ICampaignFilter.md)
- - [ICampaignFilterAndFilter](rapidata/api_client/docs/ICampaignFilterAndFilter.md)
- - [ICampaignFilterAudienceStateFilter](rapidata/api_client/docs/ICampaignFilterAudienceStateFilter.md)
- - [ICampaignFilterCampaignFilter](rapidata/api_client/docs/ICampaignFilterCampaignFilter.md)
- - [ICampaignFilterCampaignSessionCountFilter](rapidata/api_client/docs/ICampaignFilterCampaignSessionCountFilter.md)
- - [ICampaignFilterCountryFilter](rapidata/api_client/docs/ICampaignFilterCountryFilter.md)
- - [ICampaignFilterDemographicFilter](rapidata/api_client/docs/ICampaignFilterDemographicFilter.md)
- - [ICampaignFilterDeviceFilter](rapidata/api_client/docs/ICampaignFilterDeviceFilter.md)
- - [ICampaignFilterLanguageFilter](rapidata/api_client/docs/ICampaignFilterLanguageFilter.md)
  - [ICampaignFilterModel](rapidata/api_client/docs/ICampaignFilterModel.md)
  - [ICampaignFilterModelAndFilterModel](rapidata/api_client/docs/ICampaignFilterModelAndFilterModel.md)
  - [ICampaignFilterModelAudienceStateFilterModel](rapidata/api_client/docs/ICampaignFilterModelAudienceStateFilterModel.md)
@@ -495,12 +486,6 @@ Class | Method | HTTP request | Description
  - [ICampaignFilterModelResponseCountFilterModel](rapidata/api_client/docs/ICampaignFilterModelResponseCountFilterModel.md)
  - [ICampaignFilterModelUserActionRestrictionFilterModel](rapidata/api_client/docs/ICampaignFilterModelUserActionRestrictionFilterModel.md)
  - [ICampaignFilterModelUserScoreFilterModel](rapidata/api_client/docs/ICampaignFilterModelUserScoreFilterModel.md)
- - [ICampaignFilterNewUserFilter](rapidata/api_client/docs/ICampaignFilterNewUserFilter.md)
- - [ICampaignFilterNotFilter](rapidata/api_client/docs/ICampaignFilterNotFilter.md)
- - [ICampaignFilterOrFilter](rapidata/api_client/docs/ICampaignFilterOrFilter.md)
- - [ICampaignFilterResponseCountFilter](rapidata/api_client/docs/ICampaignFilterResponseCountFilter.md)
- - [ICampaignFilterUserActionRestrictionFilter](rapidata/api_client/docs/ICampaignFilterUserActionRestrictionFilter.md)
- - [ICampaignFilterUserScoreFilter](rapidata/api_client/docs/ICampaignFilterUserScoreFilter.md)
  - [ICampaignSelectionModel](rapidata/api_client/docs/ICampaignSelectionModel.md)
  - [ICampaignSelectionModelAbTestSelectionModel](rapidata/api_client/docs/ICampaignSelectionModelAbTestSelectionModel.md)
  - [ICampaignSelectionModelAudienceSelectionModel](rapidata/api_client/docs/ICampaignSelectionModelAudienceSelectionModel.md)