diff --git a/force_bdss/cli/force_bdss.py b/force_bdss/cli/force_bdss.py
index 1434b1d8d448b04b83ce8329d159b0f76b4c81e3..0277f5a4e83f29fdf2a71c5a1f9c64669d2cf3f4 100644
--- a/force_bdss/cli/force_bdss.py
+++ b/force_bdss/cli/force_bdss.py
@@ -10,13 +10,19 @@ push_exception_handler(reraise_exceptions=True)
 
 
 @click.command()
-@click.option("--evaluate", is_flag=True)
+@click.option("--evaluate",
+              is_flag=True,
+              help="Runs the evaluation for a single point.")
+@click.option("--run-datasource",
+              type=click.STRING,
+              help="If specified, runs only the specified datasource "
+                   "interactively. This is useful for debugging.")
 @click.option("--logfile",
               type=click.Path(exists=False),
               help="If specified, the log filename. "
                    " If unspecified, the log will be written to stdout.")
 @click.argument('workflow_filepath', type=click.Path(exists=True))
-def run(evaluate, logfile, workflow_filepath):
+def run(evaluate, run_datasource, logfile, workflow_filepath):
 
     logging_config = {}
     logging_config["level"] = logging.INFO
@@ -30,9 +36,11 @@ def run(evaluate, logfile, workflow_filepath):
     try:
         application = BDSSApplication(
             evaluate=evaluate,
+            run_datasource=run_datasource,
             workflow_filepath=workflow_filepath
         )
 
         application.run()
     except Exception as e:
         log.exception(e)
+