diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto
index cac4bea..1431fde 100644
--- a/schema/druncschema/controller.proto
+++ b/schema/druncschema/controller.proto
@@ -12,7 +12,7 @@ service Controller {
   rpc status                     (AddressedCommand) returns (StatusResponse) {}
 
   rpc describe_fsm               (AddressedCommand) returns (DescribeFSMResponse) {}
-  rpc execute_fsm_command        (Request) returns (Response) {}
+  rpc execute_fsm_command        (ExecuteFSMCommandRequest) returns (ExecuteFSMCommandResponse) {}
   rpc execute_expert_command     (Request) returns (Response) {}
   rpc include                    (Request) returns (Response) {}
   rpc exclude                    (Request) returns (Response) {}
@@ -34,6 +34,30 @@ message AddressedCommand {
   bool execute_on_all_subsequent_children_in_path = 6;
 }
 
+message ExecuteFSMCommandRequest {
+  Token token = 1;
+  FSMCommand command = 2;
+  string target = 3;
+  bool execute_along_path = 4;
+  bool execute_on_all_subsequent_children_in_path = 5;
+}
+
+message ExecuteFSMCommandResponse {
+  Token token = 1;
+  string name = 2;
+  string command_name = 3;
+  string data = 4;
+  repeated ExecuteFSMCommandResponse children = 5;
+  FSMResponseFlag fsm_flag = 6;
+  ResponseFlag flag = 7;
+}
+
+message FSMCommand {
+  string command_name = 1;
+  map<string, google.protobuf.Any> arguments = 2;
+  optional string data = 4;
+}
+
 message StatusResponse {
   Token token = 1;
   string name = 2;
@@ -66,12 +90,6 @@ message RecomputeStatusResponse {
   ResponseFlag flag = 5;
 }
 
-message FSMCommand {
-  string command_name = 1;
-  map<string, google.protobuf.Any> arguments = 2;
-  optional string data = 4; // unfortunately, this is just some plain old json data introduced by the fsm interfaces
-}
-
 enum FSMResponseFlag {
   FSM_EXECUTED_SUCCESSFULLY = 0;
   FSM_FAILED = 1;
@@ -80,12 +98,6 @@ enum FSMResponseFlag {
   FSM_NOT_EXECUTED_IN_ERROR = 4;
 }
 
-message FSMCommandResponse{
-  FSMResponseFlag flag = 1;
-  string command_name = 2;
-  google.protobuf.Any data = 3;
-}
-
 message Argument {
   enum Presence{
     MANDATORY = 0;
diff --git a/src/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py
index e0b5ae2..46ad8b3 100644
--- a/src/druncschema/controller_pb2.py
+++ b/src/druncschema/controller_pb2.py
@@ -28,7 +28,7 @@
 from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\x8d\x01\n\x12\x46SMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xea\x08\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12T\n\x13\x65xecute_fsm_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -37,40 +37,42 @@
   DESCRIPTOR._loaded_options = None
   _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None
   _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001'
-  _globals['_FSMRESPONSEFLAG']._serialized_start=3030
-  _globals['_FSMRESPONSEFLAG']._serialized_end=3184
+  _globals['_FSMRESPONSEFLAG']._serialized_start=3431
+  _globals['_FSMRESPONSEFLAG']._serialized_end=3585
   _globals['_ADDRESSEDCOMMAND']._serialized_start=184
   _globals['_ADDRESSEDCOMMAND']._serialized_end=429
-  _globals['_STATUSRESPONSE']._serialized_start=432
-  _globals['_STATUSRESPONSE']._serialized_end=676
-  _globals['_DESCRIBERESPONSE']._serialized_start=679
-  _globals['_DESCRIBERESPONSE']._serialized_end=926
-  _globals['_DESCRIBEFSMRESPONSE']._serialized_start=929
-  _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1204
-  _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1207
-  _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=1460
-  _globals['_FSMCOMMAND']._serialized_start=1463
-  _globals['_FSMCOMMAND']._serialized_end=1675
-  _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1596
-  _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1666
-  _globals['_FSMCOMMANDRESPONSE']._serialized_start=1678
-  _globals['_FSMCOMMANDRESPONSE']._serialized_end=1819
-  _globals['_ARGUMENT']._serialized_start=1822
-  _globals['_ARGUMENT']._serialized_end=2188
-  _globals['_ARGUMENT_PRESENCE']._serialized_start=2081
-  _globals['_ARGUMENT_PRESENCE']._serialized_end=2120
-  _globals['_ARGUMENT_TYPE']._serialized_start=2122
-  _globals['_ARGUMENT_TYPE']._serialized_end=2170
-  _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2191
-  _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2343
-  _globals['_FSMSEQUENCE']._serialized_start=2345
-  _globals['_FSMSEQUENCE']._serialized_end=2391
-  _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2394
-  _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2660
-  _globals['_STATUS']._serialized_start=2663
-  _globals['_STATUS']._serialized_end=2818
-  _globals['_RUNINFO']._serialized_start=2821
-  _globals['_RUNINFO']._serialized_end=3027
-  _globals['_CONTROLLER']._serialized_start=3187
-  _globals['_CONTROLLER']._serialized_end=4317
+  _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432
+  _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658
+  _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661
+  _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=974
+  _globals['_FSMCOMMAND']._serialized_start=977
+  _globals['_FSMCOMMAND']._serialized_end=1189
+  _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1110
+  _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1180
+  _globals['_STATUSRESPONSE']._serialized_start=1192
+  _globals['_STATUSRESPONSE']._serialized_end=1436
+  _globals['_DESCRIBERESPONSE']._serialized_start=1439
+  _globals['_DESCRIBERESPONSE']._serialized_end=1686
+  _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1689
+  _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1964
+  _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1967
+  _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2220
+  _globals['_ARGUMENT']._serialized_start=2223
+  _globals['_ARGUMENT']._serialized_end=2589
+  _globals['_ARGUMENT_PRESENCE']._serialized_start=2482
+  _globals['_ARGUMENT_PRESENCE']._serialized_end=2521
+  _globals['_ARGUMENT_TYPE']._serialized_start=2523
+  _globals['_ARGUMENT_TYPE']._serialized_end=2571
+  _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2592
+  _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2744
+  _globals['_FSMSEQUENCE']._serialized_start=2746
+  _globals['_FSMSEQUENCE']._serialized_end=2792
+  _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2795
+  _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3061
+  _globals['_STATUS']._serialized_start=3064
+  _globals['_STATUS']._serialized_end=3219
+  _globals['_RUNINFO']._serialized_start=3222
+  _globals['_RUNINFO']._serialized_end=3428
+  _globals['_CONTROLLER']._serialized_start=3588
+  _globals['_CONTROLLER']._serialized_end=4775
 # @@protoc_insertion_point(module_scope)
diff --git a/src/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi
index 947d608..af5ee94 100644
--- a/src/druncschema/controller_pb2.pyi
+++ b/src/druncschema/controller_pb2.pyi
@@ -78,6 +78,114 @@ class AddressedCommand(google.protobuf.message.Message):
 
 global___AddressedCommand = AddressedCommand
 
+@typing.final
+class ExecuteFSMCommandRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    TOKEN_FIELD_NUMBER: builtins.int
+    COMMAND_FIELD_NUMBER: builtins.int
+    TARGET_FIELD_NUMBER: builtins.int
+    EXECUTE_ALONG_PATH_FIELD_NUMBER: builtins.int
+    EXECUTE_ON_ALL_SUBSEQUENT_CHILDREN_IN_PATH_FIELD_NUMBER: builtins.int
+    target: builtins.str
+    execute_along_path: builtins.bool
+    execute_on_all_subsequent_children_in_path: builtins.bool
+    @property
+    def token(self) -> druncschema.token_pb2.Token: ...
+    @property
+    def command(self) -> global___FSMCommand: ...
+    def __init__(
+        self,
+        *,
+        token: druncschema.token_pb2.Token | None = ...,
+        command: global___FSMCommand | None = ...,
+        target: builtins.str = ...,
+        execute_along_path: builtins.bool = ...,
+        execute_on_all_subsequent_children_in_path: builtins.bool = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing.Literal["command", b"command", "token", b"token"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["command", b"command", "execute_along_path", b"execute_along_path", "execute_on_all_subsequent_children_in_path", b"execute_on_all_subsequent_children_in_path", "target", b"target", "token", b"token"]) -> None: ...
+
+global___ExecuteFSMCommandRequest = ExecuteFSMCommandRequest
+
+@typing.final
+class ExecuteFSMCommandResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    TOKEN_FIELD_NUMBER: builtins.int
+    NAME_FIELD_NUMBER: builtins.int
+    COMMAND_NAME_FIELD_NUMBER: builtins.int
+    DATA_FIELD_NUMBER: builtins.int
+    CHILDREN_FIELD_NUMBER: builtins.int
+    FSM_FLAG_FIELD_NUMBER: builtins.int
+    FLAG_FIELD_NUMBER: builtins.int
+    name: builtins.str
+    command_name: builtins.str
+    data: builtins.str
+    fsm_flag: global___FSMResponseFlag.ValueType
+    flag: druncschema.request_response_pb2.ResponseFlag.ValueType
+    @property
+    def token(self) -> druncschema.token_pb2.Token: ...
+    @property
+    def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ExecuteFSMCommandResponse]: ...
+    def __init__(
+        self,
+        *,
+        token: druncschema.token_pb2.Token | None = ...,
+        name: builtins.str = ...,
+        command_name: builtins.str = ...,
+        data: builtins.str = ...,
+        children: collections.abc.Iterable[global___ExecuteFSMCommandResponse] | None = ...,
+        fsm_flag: global___FSMResponseFlag.ValueType = ...,
+        flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "data", b"data", "flag", b"flag", "fsm_flag", b"fsm_flag", "name", b"name", "token", b"token"]) -> None: ...
+
+global___ExecuteFSMCommandResponse = ExecuteFSMCommandResponse
+
+@typing.final
+class FSMCommand(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    @typing.final
+    class ArgumentsEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: builtins.str
+        @property
+        def value(self) -> google.protobuf.any_pb2.Any: ...
+        def __init__(
+            self,
+            *,
+            key: builtins.str = ...,
+            value: google.protobuf.any_pb2.Any | None = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ...
+
+    COMMAND_NAME_FIELD_NUMBER: builtins.int
+    ARGUMENTS_FIELD_NUMBER: builtins.int
+    DATA_FIELD_NUMBER: builtins.int
+    command_name: builtins.str
+    data: builtins.str
+    @property
+    def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ...
+    def __init__(
+        self,
+        *,
+        command_name: builtins.str = ...,
+        arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ...,
+        data: builtins.str | None = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ...
+
+global___FSMCommand = FSMCommand
+
 @typing.final
 class StatusResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
@@ -202,72 +310,6 @@ class RecomputeStatusResponse(google.protobuf.message.Message):
 
 global___RecomputeStatusResponse = RecomputeStatusResponse
 
-@typing.final
-class FSMCommand(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    @typing.final
-    class ArgumentsEntry(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        KEY_FIELD_NUMBER: builtins.int
-        VALUE_FIELD_NUMBER: builtins.int
-        key: builtins.str
-        @property
-        def value(self) -> google.protobuf.any_pb2.Any: ...
-        def __init__(
-            self,
-            *,
-            key: builtins.str = ...,
-            value: google.protobuf.any_pb2.Any | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ...
-
-    COMMAND_NAME_FIELD_NUMBER: builtins.int
-    ARGUMENTS_FIELD_NUMBER: builtins.int
-    DATA_FIELD_NUMBER: builtins.int
-    command_name: builtins.str
-    data: builtins.str
-    """unfortunately, this is just some plain old json data introduced by the fsm interfaces"""
-    @property
-    def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ...
-    def __init__(
-        self,
-        *,
-        command_name: builtins.str = ...,
-        arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ...,
-        data: builtins.str | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ...
-
-global___FSMCommand = FSMCommand
-
-@typing.final
-class FSMCommandResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    FLAG_FIELD_NUMBER: builtins.int
-    COMMAND_NAME_FIELD_NUMBER: builtins.int
-    DATA_FIELD_NUMBER: builtins.int
-    flag: global___FSMResponseFlag.ValueType
-    command_name: builtins.str
-    @property
-    def data(self) -> google.protobuf.any_pb2.Any: ...
-    def __init__(
-        self,
-        *,
-        flag: global___FSMResponseFlag.ValueType = ...,
-        command_name: builtins.str = ...,
-        data: google.protobuf.any_pb2.Any | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["command_name", b"command_name", "data", b"data", "flag", b"flag"]) -> None: ...
-
-global___FSMCommandResponse = FSMCommandResponse
-
 @typing.final
 class Argument(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
diff --git a/src/druncschema/controller_pb2_grpc.py b/src/druncschema/controller_pb2_grpc.py
index 502bf4c..f6f9ca5 100644
--- a/src/druncschema/controller_pb2_grpc.py
+++ b/src/druncschema/controller_pb2_grpc.py
@@ -52,8 +52,8 @@ def __init__(self, channel):
                 _registered_method=True)
         self.execute_fsm_command = channel.unary_unary(
                 '/dunedaq.druncschema.controller.Controller/execute_fsm_command',
-                request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString,
-                response_deserializer=druncschema_dot_request__response__pb2.Response.FromString,
+                request_serializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString,
+                response_deserializer=druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.FromString,
                 _registered_method=True)
         self.execute_expert_command = channel.unary_unary(
                 '/dunedaq.druncschema.controller.Controller/execute_expert_command',
@@ -192,8 +192,8 @@ def add_ControllerServicer_to_server(servicer, server):
             ),
             'execute_fsm_command': grpc.unary_unary_rpc_method_handler(
                     servicer.execute_fsm_command,
-                    request_deserializer=druncschema_dot_request__response__pb2.Request.FromString,
-                    response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString,
+                    request_deserializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.FromString,
+                    response_serializer=druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.SerializeToString,
             ),
             'execute_expert_command': grpc.unary_unary_rpc_method_handler(
                     servicer.execute_expert_command,
@@ -342,8 +342,8 @@ def execute_fsm_command(request,
             request,
             target,
             '/dunedaq.druncschema.controller.Controller/execute_fsm_command',
-            druncschema_dot_request__response__pb2.Request.SerializeToString,
-            druncschema_dot_request__response__pb2.Response.FromString,
+            druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString,
+            druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.FromString,
             options,
             channel_credentials,
             insecure,