diff --git a/src/AMSWorkflow/ams/ams_flux.py b/src/AMSWorkflow/ams/ams_flux.py
index e1661d7e..1b803284 100644
--- a/src/AMSWorkflow/ams/ams_flux.py
+++ b/src/AMSWorkflow/ams/ams_flux.py
@@ -19,8 +19,6 @@
 import flux
 from queue import Queue
 
-from ams.orchestrator import AvailableDomains, DomainSpec
-
 
 # pylint: disable=too-many-instance-attributes
 class AMSFluxExecutorFuture(Future):
@@ -55,9 +53,9 @@ def __get_uri_cb(fut, eventlog):
     def __init__(
         self,
         owning_thread_id: int,
-        flux_executor: Union[AMSFluxOrchestratorExecutor, AMSFluxExecutor],
+        flux_executor,
         track_uri: bool,
-        domain_descr: DomainSpec,
+        domain_descr,
         *args,
         **kwargs,
     ):
@@ -436,12 +434,12 @@ class AMSFakeFluxOrchestatorExecutor(ThreadPoolExecutor):
     job.
     """
 
-    def __init__(self, o_queue: Queue, domains: AvailableDomains, *args, **kwargs):
+    def __init__(self, o_queue: Queue, domains, *args, **kwargs):
         self._o_queue = o_queue
         self._domains = domains
         super().__init__(*args, **kwargs)
 
-    def submit(self, domain: DomainSpec, job_spec):
+    def submit(self, domain, job_spec):
         """Submit a jobspec to Flux and return a ``FluxExecutorFuture``.
 
         Accepts the same positional and keyword arguments as ``flux.job.submit``,
diff --git a/src/AMSWorkflow/ams/ams_jobs.py b/src/AMSWorkflow/ams/ams_jobs.py
index c42c8db3..ed65d2bb 100644
--- a/src/AMSWorkflow/ams/ams_jobs.py
+++ b/src/AMSWorkflow/ams/ams_jobs.py
@@ -5,6 +5,8 @@
 from typing import Optional
 from dataclasses import dataclass, fields
 from ams import util
+from ams.store import AMSDataStore 
+from ams.rmq import AMSRMQConfiguration
 from typing import Dict, List, Union, Optional, Mapping
 from pathlib import Path