diff --git a/ads/aqua/evaluation/entities.py b/ads/aqua/evaluation/entities.py
index 20c3c01da..ad49c88ae 100644
--- a/ads/aqua/evaluation/entities.py
+++ b/ads/aqua/evaluation/entities.py
@@ -83,7 +83,7 @@ class CreateAquaEvaluationDetails(Serializable):
     ocpus: Optional[float] = None
     log_group_id: Optional[str] = None
     log_id: Optional[str] = None
-    metrics: Optional[List[str]] = None
+    metrics: Optional[List[Dict[str, Any]]] = None
     force_overwrite: Optional[bool] = False
 
     class Config:
@@ -140,7 +140,7 @@ class AquaEvaluationCommands(Serializable):
     evaluation_id: str
     evaluation_target_id: str
     input_data: Dict[str, Any]
-    metrics: List[str]
+    metrics: List[Dict[str, Any]]
     output_dir: str
     params: Dict[str, Any]
 
diff --git a/ads/aqua/evaluation/evaluation.py b/ads/aqua/evaluation/evaluation.py
index 8cc799d18..cfd0029e6 100644
--- a/ads/aqua/evaluation/evaluation.py
+++ b/ads/aqua/evaluation/evaluation.py
@@ -159,7 +159,8 @@ def create(
                 create_aqua_evaluation_details = CreateAquaEvaluationDetails(**kwargs)
             except Exception as ex:
                 custom_errors = {
-                    ".".join(map(str, e["loc"])): e["msg"] for e in json.loads(ex.json())
+                    ".".join(map(str, e["loc"])): e["msg"]
+                    for e in json.loads(ex.json())
                 }
                 raise AquaValueError(
                     f"Invalid create evaluation parameters. Error details: {custom_errors}."
@@ -619,11 +620,6 @@ def _build_launch_cmd(
             evaluation_id=evaluation_id,
             evaluation_target_id=evaluation_source_id,
             input_data={
-                "columns": {
-                    "prompt": "prompt",
-                    "completion": "completion",
-                    "category": "category",
-                },
                 "format": Path(dataset_path).suffix,
                 "url": dataset_path,
             },