diff --git a/source/HomeAssistantMenuItemFactory.mc b/source/HomeAssistantMenuItemFactory.mc
index 0563929..a05e716 100644
--- a/source/HomeAssistantMenuItemFactory.mc
+++ b/source/HomeAssistantMenuItemFactory.mc
@@ -70,6 +70,7 @@ class HomeAssistantMenuItemFactory {
     //! @param label     Menu item label.
     //! @param entity_id Home Assistant Entity ID (optional)
     //! @param template  Template for Home Assistant to render (optional)
+    //! @param exit      Should the service call complete and then exit?
     //! @param confirm   Should this menu item selection be confirmed?
     //! @param pin       Should this menu item selection request the security PIN?
     //
@@ -98,9 +99,10 @@ class HomeAssistantMenuItemFactory {
     //! @param entity_id Home Assistant Entity ID (optional)
     //! @param template  Template for Home Assistant to render (optional)
     //! @param service   Template for Home Assistant to render (optional)
+    //! @param data      Sourced from the menu JSON, this is the `data` field from the `tap_action` field.
+    //! @param exit      Should the service call complete and then exit?
     //! @param confirm   Should this menu item selection be confirmed?
     //! @param pin       Should this menu item selection request the security PIN?
-    //! @param data      Sourced from the menu JSON, this is the `data` field from the `tap_action` field.
     //
     function tap(
         label     as Lang.String     or Lang.Symbol,
diff --git a/source/HomeAssistantTapMenuItem.mc b/source/HomeAssistantTapMenuItem.mc
index 9553f73..7a59750 100644
--- a/source/HomeAssistantTapMenuItem.mc
+++ b/source/HomeAssistantTapMenuItem.mc
@@ -32,9 +32,10 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
     //! @param label     Menu item label.
     //! @param template  Menu item template.
     //! @param service   Menu item service.
+    //! @param data      Data to supply to the service call.
+    //! @param exit      Should the service call complete and then exit?
     //! @param confirm   Should the service call be confirmed to avoid accidental invocation?
     //! @param pin       Should the service call be protected with a PIN for some low level of security?
-    //! @param data      Data to supply to the service call.
     //! @param icon      Icon to use for the menu item.
     //! @param options   Menu item options to be passed on.
     //! @param haService Shared Home Assistant service object that will perform the required call. Only
diff --git a/source/HomeAssistantToggleMenuItem.mc b/source/HomeAssistantToggleMenuItem.mc
index 9ddc347..7f55aff 100644
--- a/source/HomeAssistantToggleMenuItem.mc
+++ b/source/HomeAssistantToggleMenuItem.mc
@@ -33,9 +33,10 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
     //!
     //! @param label    Menu item label.
     //! @param template Menu item template.
+    //! @param data     Data to supply to the service call.
+    //! @param exit     Should the service call complete and then exit?
     //! @param confirm  Should the service call be confirmed to avoid accidental invocation?
     //! @param pin      Should the service call be protected with a PIN for some low level of security?
-    //! @param data     Data to supply to the service call.
     //! @param options  Menu item options to be passed on.
     //
     function initialize(