diff --git a/src/sasctl/_services/score_definitions.py b/src/sasctl/_services/score_definitions.py
index 448a28c5..2c05611f 100644
--- a/src/sasctl/_services/score_definitions.py
+++ b/src/sasctl/_services/score_definitions.py
@@ -83,9 +83,7 @@ def create_score_definition(
         else:
             object_descriptor_type = "sas.models.model.ds2"
 
-        if cls._model_repository.is_uuid(model):
-            model_id = model
-        elif isinstance(model, dict) and "id" in model:
+        if isinstance(model, dict) and "id" in model:
             model_id = model["id"]
         else:
             model = cls._model_repository.get_model(model)
diff --git a/src/sasctl/tasks.py b/src/sasctl/tasks.py
index 6bf5c67b..ca659630 100644
--- a/src/sasctl/tasks.py
+++ b/src/sasctl/tasks.py
@@ -981,6 +981,7 @@ def score_model_with_cas(
     library_name: str = "Public",
     model_version: str = "latest",
     use_cas_gateway: bool = False,
+    timeout: int = 300,
 ):
     score_definition = sd.create_score_definition(
         score_def_name,
@@ -994,7 +995,7 @@ def score_model_with_cas(
         use_cas_gateway=use_cas_gateway,
     )
     score_execution = se.create_score_execution(score_definition.id)
-    score_execution_poll = se.poll_score_execution_state(score_execution)
+    score_execution_poll = se.poll_score_execution_state(score_execution, timeout)
     print(score_execution_poll)
     score_results = se.get_score_execution_results(score_execution, use_cas_gateway)
     return score_results