ibm_watson 0.14.0 → 0.15.0

data/lib/ibm_watson/assistant_v1.rb

@@ -21,7 +21,6 @@
 require "concurrent"
 require "erb"
 require "json"
-
 require "ibm_cloud_sdk_core"
 require_relative "./common.rb"
 
@@ -90,34 +89,35 @@ module IBMWatson
     #########################
 
     ##
-    # @!method message(workspace_id:, input: nil, alternate_intents: nil, context: nil, entities: nil, intents: nil, output: nil, nodes_visited_details: nil)
+    # @!method message(workspace_id:, input: nil, intents: nil, entities: nil, alternate_intents: nil, context: nil, output: nil, nodes_visited_details: nil)
     # Get response to user input.
     # Send user input to a workspace and receive a response.
     #
     #   There is no rate limit for this operation.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param input [InputData] An input object that includes the input text.
-    # @param alternate_intents [Boolean] Whether to return more than one intent. Set to `true` to return all matching
-    #   intents.
-    # @param context [Context] State information for the conversation. To maintain state, include the context
-    #   from the previous response.
-    # @param entities [Array[RuntimeEntity]] Entities to use when evaluating the message. Include entities from the previous
-    #   response to continue using those entities rather than detecting entities in the
-    #   new input.
+    # @param input [MessageInput] An input object that includes the input text.
     # @param intents [Array[RuntimeIntent]] Intents to use when evaluating the user input. Include intents from the previous
     #   response to continue using those intents rather than trying to recognize intents
     #   in the new input.
+    # @param entities [Array[RuntimeEntity]] Entities to use when evaluating the message. Include entities from the previous
+    #   response to continue using those entities rather than detecting entities in the
+    #   new input.
+    # @param alternate_intents [Boolean] Whether to return more than one intent. A value of `true` indicates that all
+    #   matching intents are returned.
+    # @param context [Context] State information for the conversation. To maintain state, include the context
+    #   from the previous response.
     # @param output [OutputData] An output object that includes the response to the user, the dialog nodes that
     #   were triggered, and messages from the log.
     # @param nodes_visited_details [Boolean] Whether to include additional diagnostic information about the dialog nodes that
     #   were visited during processing of the message.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def message(workspace_id:, input: nil, alternate_intents: nil, context: nil, entities: nil, intents: nil, output: nil, nodes_visited_details: nil)
+    def message(workspace_id:, input: nil, intents: nil, entities: nil, alternate_intents: nil, context: nil, output: nil, nodes_visited_details: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "message")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "message")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -126,10 +126,10 @@ module IBMWatson
 
       data = {
         "input" => input,
+        "intents" => intents,
+        "entities" => entities,
         "alternate_intents" => alternate_intents,
         "context" => context,
-        "entities" => entities,
-        "intents" => intents,
         "output" => output
       }
 
@@ -150,48 +150,7 @@ module IBMWatson
     #########################
 
     ##
-    # @!method list_workspaces(page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-    # List workspaces.
-    # List the workspaces associated with a Watson Assistant service instance.
-    #
-    #   This operation is limited to 500 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param page_limit [Fixnum] The number of records to return in each page of results.
-    # @param include_count [Boolean] Whether to include information about the number of records returned.
-    # @param sort [String] The attribute by which returned workspaces will be sorted. To reverse the sort
-    #   order, prefix the value with a minus sign (`-`).
-    # @param cursor [String] A token identifying the page of results to retrieve.
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_workspaces(page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_workspaces")
-
-      params = {
-        "version" => @version,
-        "page_limit" => page_limit,
-        "include_count" => include_count,
-        "sort" => sort,
-        "cursor" => cursor,
-        "include_audit" => include_audit
-      }
-
-      method_url = "/v1/workspaces"
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method create_workspace(name: nil, description: nil, language: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, metadata: nil, learning_opt_out: nil, system_settings: nil)
+    # @!method create_workspace(name: nil, description: nil, language: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil)
     # Create workspace.
     # Create a workspace based on component objects. You must provide workspace
     #   components defining the content of the new workspace.
@@ -203,20 +162,22 @@ module IBMWatson
     # @param description [String] The description of the workspace. This string cannot contain carriage return,
     #   newline, or tab characters, and it must be no longer than 128 characters.
     # @param language [String] The language of the workspace.
+    # @param metadata [Hash] Any metadata related to the workspace.
+    # @param learning_opt_out [Boolean] Whether training data from the workspace (including artifacts such as intents and
+    #   entities) can be used by IBM for general service improvements. `true` indicates
+    #   that workspace training data is not to be used.
+    # @param system_settings [WorkspaceSystemSettings] Global settings for the workspace.
     # @param intents [Array[CreateIntent]] An array of objects defining the intents for the workspace.
-    # @param entities [Array[CreateEntity]] An array of objects defining the entities for the workspace.
-    # @param dialog_nodes [Array[CreateDialogNode]] An array of objects defining the nodes in the dialog.
-    # @param counterexamples [Array[CreateCounterexample]] An array of objects defining input examples that have been marked as irrelevant
+    # @param entities [Array[CreateEntity]] An array of objects describing the entities for the workspace.
+    # @param dialog_nodes [Array[DialogNode]] An array of objects describing the dialog nodes in the workspace.
+    # @param counterexamples [Array[Counterexample]] An array of objects defining input examples that have been marked as irrelevant
     #   input.
-    # @param metadata [Object] Any metadata related to the workspace.
-    # @param learning_opt_out [Boolean] Whether training data from the workspace can be used by IBM for general service
-    #   improvements. `true` indicates that workspace training data is not to be used.
-    # @param system_settings [WorkspaceSystemSettings] Global settings for the workspace.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_workspace(name: nil, description: nil, language: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, metadata: nil, learning_opt_out: nil, system_settings: nil)
+    def create_workspace(name: nil, description: nil, language: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil)
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_workspace")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_workspace")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -226,13 +187,13 @@ module IBMWatson
         "name" => name,
         "description" => description,
         "language" => language,
+        "metadata" => metadata,
+        "learning_opt_out" => learning_opt_out,
+        "system_settings" => system_settings,
         "intents" => intents,
         "entities" => entities,
         "dialog_nodes" => dialog_nodes,
-        "counterexamples" => counterexamples,
-        "metadata" => metadata,
-        "learning_opt_out" => learning_opt_out,
-        "system_settings" => system_settings
+        "counterexamples" => counterexamples
       }
 
       method_url = "/v1/workspaces"
@@ -248,6 +209,39 @@ module IBMWatson
       response
     end
 
+    ##
+    # @!method delete_workspace(workspace_id:)
+    # Delete workspace.
+    # Delete a workspace from the service instance.
+    #
+    #   This operation is limited to 30 requests per 30 minutes. For more information, see
+    #   **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @return [nil]
+    def delete_workspace(workspace_id:)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_workspace")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/workspaces/%s" % [ERB::Util.url_encode(workspace_id)]
+
+      request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      nil
+    end
+
     ##
     # @!method get_workspace(workspace_id:, export: nil, include_audit: nil, sort: nil)
     # Get information about a workspace.
@@ -271,7 +265,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_workspace")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_workspace")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -293,7 +288,49 @@ module IBMWatson
     end
 
     ##
-    # @!method update_workspace(workspace_id:, name: nil, description: nil, language: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, append: nil)
+    # @!method list_workspaces(page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+    # List workspaces.
+    # List the workspaces associated with a Watson Assistant service instance.
+    #
+    #   This operation is limited to 500 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param page_limit [Fixnum] The number of records to return in each page of results.
+    # @param include_count [Boolean] Whether to include information about the number of records returned.
+    # @param sort [String] The attribute by which returned workspaces will be sorted. To reverse the sort
+    #   order, prefix the value with a minus sign (`-`).
+    # @param cursor [String] A token identifying the page of results to retrieve.
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def list_workspaces(page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_workspaces")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "page_limit" => page_limit,
+        "include_count" => include_count,
+        "sort" => sort,
+        "cursor" => cursor,
+        "include_audit" => include_audit
+      }
+
+      method_url = "/v1/workspaces"
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
+    ##
+    # @!method update_workspace(workspace_id:, name: nil, description: nil, language: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, append: nil)
     # Update workspace.
     # Update an existing workspace with new or modified data. You must provide component
     #   objects defining the content of the updated workspace.
@@ -306,15 +343,16 @@ module IBMWatson
     # @param description [String] The description of the workspace. This string cannot contain carriage return,
     #   newline, or tab characters, and it must be no longer than 128 characters.
     # @param language [String] The language of the workspace.
+    # @param metadata [Hash] Any metadata related to the workspace.
+    # @param learning_opt_out [Boolean] Whether training data from the workspace (including artifacts such as intents and
+    #   entities) can be used by IBM for general service improvements. `true` indicates
+    #   that workspace training data is not to be used.
+    # @param system_settings [WorkspaceSystemSettings] Global settings for the workspace.
     # @param intents [Array[CreateIntent]] An array of objects defining the intents for the workspace.
-    # @param entities [Array[CreateEntity]] An array of objects defining the entities for the workspace.
-    # @param dialog_nodes [Array[CreateDialogNode]] An array of objects defining the nodes in the dialog.
-    # @param counterexamples [Array[CreateCounterexample]] An array of objects defining input examples that have been marked as irrelevant
+    # @param entities [Array[CreateEntity]] An array of objects describing the entities for the workspace.
+    # @param dialog_nodes [Array[DialogNode]] An array of objects describing the dialog nodes in the workspace.
+    # @param counterexamples [Array[Counterexample]] An array of objects defining input examples that have been marked as irrelevant
     #   input.
-    # @param metadata [Object] Any metadata related to the workspace.
-    # @param learning_opt_out [Boolean] Whether training data from the workspace can be used by IBM for general service
-    #   improvements. `true` indicates that workspace training data is not to be used.
-    # @param system_settings [WorkspaceSystemSettings] Global settings for the workspace.
     # @param append [Boolean] Whether the new data is to be appended to the existing data in the workspace. If
     #   **append**=`false`, elements included in the new data completely replace the
     #   corresponding existing elements, including all subelements. For example, if the
@@ -325,12 +363,13 @@ module IBMWatson
     #   added. If any elements in the new data collide with existing elements, the update
     #   request fails.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_workspace(workspace_id:, name: nil, description: nil, language: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, append: nil)
+    def update_workspace(workspace_id:, name: nil, description: nil, language: nil, metadata: nil, learning_opt_out: nil, system_settings: nil, intents: nil, entities: nil, dialog_nodes: nil, counterexamples: nil, append: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_workspace")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_workspace")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -341,13 +380,13 @@ module IBMWatson
         "name" => name,
         "description" => description,
         "language" => language,
+        "metadata" => metadata,
+        "learning_opt_out" => learning_opt_out,
+        "system_settings" => system_settings,
         "intents" => intents,
         "entities" => entities,
         "dialog_nodes" => dialog_nodes,
-        "counterexamples" => counterexamples,
-        "metadata" => metadata,
-        "learning_opt_out" => learning_opt_out,
-        "system_settings" => system_settings
+        "counterexamples" => counterexamples
       }
 
       method_url = "/v1/workspaces/%s" % [ERB::Util.url_encode(workspace_id)]
@@ -362,91 +401,10 @@ module IBMWatson
       )
       response
     end
-
-    ##
-    # @!method delete_workspace(workspace_id:)
-    # Delete workspace.
-    # Delete a workspace from the service instance.
-    #
-    #   This operation is limited to 30 requests per 30 minutes. For more information, see
-    #   **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @return [nil]
-    def delete_workspace(workspace_id:)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_workspace")
-
-      params = {
-        "version" => @version
-      }
-
-      method_url = "/v1/workspaces/%s" % [ERB::Util.url_encode(workspace_id)]
-
-      request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      nil
-    end
     #########################
     # Intents
     #########################
 
-    ##
-    # @!method list_intents(workspace_id:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-    # List intents.
-    # List the intents for a workspace.
-    #
-    #   With **export**=`false`, this operation is limited to 2000 requests per 30
-    #   minutes. With **export**=`true`, the limit is 400 requests per 30 minutes. For
-    #   more information, see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param export [Boolean] Whether to include all element content in the returned data. If
-    #   **export**=`false`, the returned data includes only information about the element
-    #   itself. If **export**=`true`, all content, including subelements, is included.
-    # @param page_limit [Fixnum] The number of records to return in each page of results.
-    # @param include_count [Boolean] Whether to include information about the number of records returned.
-    # @param sort [String] The attribute by which returned intents will be sorted. To reverse the sort order,
-    #   prefix the value with a minus sign (`-`).
-    # @param cursor [String] A token identifying the page of results to retrieve.
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_intents(workspace_id:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_intents")
-
-      params = {
-        "version" => @version,
-        "export" => export,
-        "page_limit" => page_limit,
-        "include_count" => include_count,
-        "sort" => sort,
-        "cursor" => cursor,
-        "include_audit" => include_audit
-      }
-
-      method_url = "/v1/workspaces/%s/intents" % [ERB::Util.url_encode(workspace_id)]
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
     ##
     # @!method create_intent(workspace_id:, intent:, description: nil, examples: nil)
     # Create intent.
@@ -462,7 +420,7 @@ module IBMWatson
     #   - It must be no longer than 128 characters.
     # @param description [String] The description of the intent. This string cannot contain carriage return,
     #   newline, or tab characters, and it must be no longer than 128 characters.
-    # @param examples [Array[CreateExample]] An array of user input examples for the intent.
+    # @param examples [Array[Example]] An array of user input examples for the intent.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def create_intent(workspace_id:, intent:, description: nil, examples: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
@@ -471,7 +429,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_intent")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_intent")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -496,6 +455,42 @@ module IBMWatson
       response
     end
 
+    ##
+    # @!method delete_intent(workspace_id:, intent:)
+    # Delete intent.
+    # Delete an intent from a workspace.
+    #
+    #   This operation is limited to 2000 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param intent [String] The intent name.
+    # @return [nil]
+    def delete_intent(workspace_id:, intent:)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      raise ArgumentError.new("intent must be provided") if intent.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_intent")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/workspaces/%s/intents/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent)]
+
+      request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      nil
+    end
+
     ##
     # @!method get_intent(workspace_id:, intent:, export: nil, include_audit: nil)
     # Get intent.
@@ -519,7 +514,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_intent")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_intent")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -540,11 +536,61 @@ module IBMWatson
     end
 
     ##
-    # @!method update_intent(workspace_id:, intent:, new_intent: nil, new_description: nil, new_examples: nil)
-    # Update intent.
-    # Update an existing intent with new or modified data. You must provide component
-    #   objects defining the content of the updated intent.
-    #
+    # @!method list_intents(workspace_id:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+    # List intents.
+    # List the intents for a workspace.
+    #
+    #   With **export**=`false`, this operation is limited to 2000 requests per 30
+    #   minutes. With **export**=`true`, the limit is 400 requests per 30 minutes. For
+    #   more information, see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param export [Boolean] Whether to include all element content in the returned data. If
+    #   **export**=`false`, the returned data includes only information about the element
+    #   itself. If **export**=`true`, all content, including subelements, is included.
+    # @param page_limit [Fixnum] The number of records to return in each page of results.
+    # @param include_count [Boolean] Whether to include information about the number of records returned.
+    # @param sort [String] The attribute by which returned intents will be sorted. To reverse the sort order,
+    #   prefix the value with a minus sign (`-`).
+    # @param cursor [String] A token identifying the page of results to retrieve.
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def list_intents(workspace_id:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_intents")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "export" => export,
+        "page_limit" => page_limit,
+        "include_count" => include_count,
+        "sort" => sort,
+        "cursor" => cursor,
+        "include_audit" => include_audit
+      }
+
+      method_url = "/v1/workspaces/%s/intents" % [ERB::Util.url_encode(workspace_id)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
+    ##
+    # @!method update_intent(workspace_id:, intent:, new_intent: nil, new_description: nil, new_examples: nil)
+    # Update intent.
+    # Update an existing intent with new or modified data. You must provide component
+    #   objects defining the content of the updated intent.
+    #
     #   This operation is limited to 2000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
@@ -554,8 +600,9 @@ module IBMWatson
     #   characters.
     #   - It cannot begin with the reserved prefix `sys-`.
     #   - It must be no longer than 128 characters.
-    # @param new_description [String] The description of the intent.
-    # @param new_examples [Array[CreateExample]] An array of user input examples for the intent.
+    # @param new_description [String] The description of the intent. This string cannot contain carriage return,
+    #   newline, or tab characters, and it must be no longer than 128 characters.
+    # @param new_examples [Array[Example]] An array of user input examples for the intent.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def update_intent(workspace_id:, intent:, new_intent: nil, new_description: nil, new_examples: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
@@ -564,7 +611,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_intent")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_intent")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -588,31 +636,88 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Examples
+    #########################
+
+    ##
+    # @!method create_example(workspace_id:, intent:, text:, mentions: nil)
+    # Create user input example.
+    # Add a new user input example to an intent.
+    #
+    #   This operation is limited to 1000 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param intent [String] The intent name.
+    # @param text [String] The text of a user input example. This string must conform to the following
+    #   restrictions:
+    #   - It cannot contain carriage return, newline, or tab characters.
+    #   - It cannot consist of only whitespace characters.
+    #   - It must be no longer than 1024 characters.
+    # @param mentions [Array[Mention]] An array of contextual entity mentions.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def create_example(workspace_id:, intent:, text:, mentions: nil)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      raise ArgumentError.new("intent must be provided") if intent.nil?
+
+      raise ArgumentError.new("text must be provided") if text.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_example")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      data = {
+        "text" => text,
+        "mentions" => mentions
+      }
+
+      method_url = "/v1/workspaces/%s/intents/%s/examples" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent)]
+
+      response = request(
+        method: "POST",
+        url: method_url,
+        headers: headers,
+        params: params,
+        json: data,
+        accept_json: true
+      )
+      response
+    end
 
     ##
-    # @!method delete_intent(workspace_id:, intent:)
-    # Delete intent.
-    # Delete an intent from a workspace.
+    # @!method delete_example(workspace_id:, intent:, text:)
+    # Delete user input example.
+    # Delete a user input example from an intent.
     #
-    #   This operation is limited to 2000 requests per 30 minutes. For more information,
+    #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param intent [String] The intent name.
+    # @param text [String] The text of the user input example.
     # @return [nil]
-    def delete_intent(workspace_id:, intent:)
+    def delete_example(workspace_id:, intent:, text:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("intent must be provided") if intent.nil?
 
+      raise ArgumentError.new("text must be provided") if text.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_intent")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_example")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/workspaces/%s/intents/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent)]
+      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
 
       request(
         method: "DELETE",
@@ -623,9 +728,48 @@ module IBMWatson
       )
       nil
     end
-    #########################
-    # Examples
-    #########################
+
+    ##
+    # @!method get_example(workspace_id:, intent:, text:, include_audit: nil)
+    # Get user input example.
+    # Get information about a user input example.
+    #
+    #   This operation is limited to 6000 requests per 5 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param intent [String] The intent name.
+    # @param text [String] The text of the user input example.
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_example(workspace_id:, intent:, text:, include_audit: nil)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      raise ArgumentError.new("intent must be provided") if intent.nil?
+
+      raise ArgumentError.new("text must be provided") if text.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_example")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "include_audit" => include_audit
+      }
+
+      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
 
     ##
     # @!method list_examples(workspace_id:, intent:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
@@ -652,7 +796,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_examples")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_examples")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -676,22 +821,23 @@ module IBMWatson
     end
 
     ##
-    # @!method create_example(workspace_id:, intent:, text:, mentions: nil)
-    # Create user input example.
-    # Add a new user input example to an intent.
+    # @!method update_example(workspace_id:, intent:, text:, new_text: nil, new_mentions: nil)
+    # Update user input example.
+    # Update the text of a user input example.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param intent [String] The intent name.
-    # @param text [String] The text of a user input example. This string must conform to the following
+    # @param text [String] The text of the user input example.
+    # @param new_text [String] The text of the user input example. This string must conform to the following
     #   restrictions:
     #   - It cannot contain carriage return, newline, or tab characters.
     #   - It cannot consist of only whitespace characters.
     #   - It must be no longer than 1024 characters.
-    # @param mentions [Array[Mentions]] An array of contextual entity mentions.
+    # @param new_mentions [Array[Mention]] An array of contextual entity mentions.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_example(workspace_id:, intent:, text:, mentions: nil)
+    def update_example(workspace_id:, intent:, text:, new_text: nil, new_mentions: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("intent must be provided") if intent.nil?
@@ -700,18 +846,19 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_example")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_example")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "text" => text,
-        "mentions" => mentions
+        "text" => new_text,
+        "mentions" => new_mentions
       }
 
-      method_url = "/v1/workspaces/%s/intents/%s/examples" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent)]
+      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
 
       response = request(
         method: "POST",
@@ -723,138 +870,132 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Counterexamples
+    #########################
 
     ##
-    # @!method get_example(workspace_id:, intent:, text:, include_audit: nil)
-    # Get user input example.
-    # Get information about a user input example.
+    # @!method create_counterexample(workspace_id:, text:)
+    # Create counterexample.
+    # Add a new counterexample to a workspace. Counterexamples are examples that have
+    #   been marked as irrelevant input.
     #
-    #   This operation is limited to 6000 requests per 5 minutes. For more information,
+    #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param intent [String] The intent name.
-    # @param text [String] The text of the user input example.
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
+    # @param text [String] The text of a user input marked as irrelevant input. This string must conform to
+    #   the following restrictions:
+    #   - It cannot contain carriage return, newline, or tab characters
+    #   - It cannot consist of only whitespace characters
+    #   - It must be no longer than 1024 characters.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_example(workspace_id:, intent:, text:, include_audit: nil)
+    def create_counterexample(workspace_id:, text:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("intent must be provided") if intent.nil?
-
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_example")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_counterexample")
+      headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "include_audit" => include_audit
+        "version" => @version
       }
 
-      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
+      data = {
+        "text" => text
+      }
+
+      method_url = "/v1/workspaces/%s/counterexamples" % [ERB::Util.url_encode(workspace_id)]
 
       response = request(
-        method: "GET",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method update_example(workspace_id:, intent:, text:, new_text: nil, new_mentions: nil)
-    # Update user input example.
-    # Update the text of a user input example.
+    # @!method delete_counterexample(workspace_id:, text:)
+    # Delete counterexample.
+    # Delete a counterexample from a workspace. Counterexamples are examples that have
+    #   been marked as irrelevant input.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param intent [String] The intent name.
-    # @param text [String] The text of the user input example.
-    # @param new_text [String] The text of the user input example. This string must conform to the following
-    #   restrictions:
-    #   - It cannot contain carriage return, newline, or tab characters.
-    #   - It cannot consist of only whitespace characters.
-    #   - It must be no longer than 1024 characters.
-    # @param new_mentions [Array[Mentions]] An array of contextual entity mentions.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_example(workspace_id:, intent:, text:, new_text: nil, new_mentions: nil)
+    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
+    # @return [nil]
+    def delete_counterexample(workspace_id:, text:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("intent must be provided") if intent.nil?
-
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_example")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_counterexample")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "text" => new_text,
-        "mentions" => new_mentions
-      }
-
-      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
+      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
 
-      response = request(
-        method: "POST",
+      request(
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
-      response
+      nil
     end
 
     ##
-    # @!method delete_example(workspace_id:, intent:, text:)
-    # Delete user input example.
-    # Delete a user input example from an intent.
+    # @!method get_counterexample(workspace_id:, text:, include_audit: nil)
+    # Get counterexample.
+    # Get information about a counterexample. Counterexamples are examples that have
+    #   been marked as irrelevant input.
     #
-    #   This operation is limited to 1000 requests per 30 minutes. For more information,
+    #   This operation is limited to 6000 requests per 5 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param intent [String] The intent name.
-    # @param text [String] The text of the user input example.
-    # @return [nil]
-    def delete_example(workspace_id:, intent:, text:)
+    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_counterexample(workspace_id:, text:, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("intent must be provided") if intent.nil?
-
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_example")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_counterexample")
+      headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
+        "version" => @version,
+        "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/intents/%s/examples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(intent), ERB::Util.url_encode(text)]
+      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
 
-      request(
-        method: "DELETE",
+      response = request(
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
         accept_json: true
       )
-      nil
+      response
     end
-    #########################
-    # Counterexamples
-    #########################
 
     ##
     # @!method list_counterexamples(workspace_id:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
@@ -878,7 +1019,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_counterexamples")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_counterexamples")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -902,38 +1044,40 @@ module IBMWatson
     end
 
     ##
-    # @!method create_counterexample(workspace_id:, text:)
-    # Create counterexample.
-    # Add a new counterexample to a workspace. Counterexamples are examples that have
-    #   been marked as irrelevant input.
+    # @!method update_counterexample(workspace_id:, text:, new_text: nil)
+    # Update counterexample.
+    # Update the text of a counterexample. Counterexamples are examples that have been
+    #   marked as irrelevant input.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param text [String] The text of a user input marked as irrelevant input. This string must conform to
+    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
+    # @param new_text [String] The text of a user input marked as irrelevant input. This string must conform to
     #   the following restrictions:
     #   - It cannot contain carriage return, newline, or tab characters
     #   - It cannot consist of only whitespace characters
     #   - It must be no longer than 1024 characters.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_counterexample(workspace_id:, text:)
+    def update_counterexample(workspace_id:, text:, new_text: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_counterexample")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_counterexample")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "text" => text
+        "text" => new_text
       }
 
-      method_url = "/v1/workspaces/%s/counterexamples" % [ERB::Util.url_encode(workspace_id)]
+      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
 
       response = request(
         method: "POST",
@@ -945,126 +1089,145 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Entities
+    #########################
 
     ##
-    # @!method get_counterexample(workspace_id:, text:, include_audit: nil)
-    # Get counterexample.
-    # Get information about a counterexample. Counterexamples are examples that have
-    #   been marked as irrelevant input.
+    # @!method create_entity(workspace_id:, entity:, description: nil, metadata: nil, fuzzy_match: nil, values: nil)
+    # Create entity.
+    # Create a new entity, or enable a system entity.
     #
-    #   This operation is limited to 6000 requests per 5 minutes. For more information,
+    #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
+    # @param entity [String] The name of the entity. This string must conform to the following restrictions:
+    #   - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
+    #   - It must be no longer than 64 characters.
+    #
+    #   If you specify an entity name beginning with the reserved prefix `sys-`, it must
+    #   be the name of a system entity that you want to enable. (Any entity content
+    #   specified with the request is ignored.).
+    # @param description [String] The description of the entity. This string cannot contain carriage return,
+    #   newline, or tab characters, and it must be no longer than 128 characters.
+    # @param metadata [Hash] Any metadata related to the entity.
+    # @param fuzzy_match [Boolean] Whether to use fuzzy matching for the entity.
+    # @param values [Array[CreateValue]] An array of objects describing the entity values.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_counterexample(workspace_id:, text:, include_audit: nil)
+    def create_entity(workspace_id:, entity:, description: nil, metadata: nil, fuzzy_match: nil, values: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("text must be provided") if text.nil?
+      raise ArgumentError.new("entity must be provided") if entity.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_counterexample")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_entity")
+      headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "include_audit" => include_audit
+        "version" => @version
       }
 
-      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
+      data = {
+        "entity" => entity,
+        "description" => description,
+        "metadata" => metadata,
+        "fuzzy_match" => fuzzy_match,
+        "values" => values
+      }
+
+      method_url = "/v1/workspaces/%s/entities" % [ERB::Util.url_encode(workspace_id)]
 
       response = request(
-        method: "GET",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method update_counterexample(workspace_id:, text:, new_text: nil)
-    # Update counterexample.
-    # Update the text of a counterexample. Counterexamples are examples that have been
-    #   marked as irrelevant input.
+    # @!method delete_entity(workspace_id:, entity:)
+    # Delete entity.
+    # Delete an entity from a workspace, or disable a system entity.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
-    # @param new_text [String] The text of a user input counterexample.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_counterexample(workspace_id:, text:, new_text: nil)
+    # @param entity [String] The name of the entity.
+    # @return [nil]
+    def delete_entity(workspace_id:, entity:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("text must be provided") if text.nil?
+      raise ArgumentError.new("entity must be provided") if entity.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_counterexample")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_entity")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "text" => new_text
-      }
-
-      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
+      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
 
-      response = request(
-        method: "POST",
+      request(
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
-      response
+      nil
     end
 
     ##
-    # @!method delete_counterexample(workspace_id:, text:)
-    # Delete counterexample.
-    # Delete a counterexample from a workspace. Counterexamples are examples that have
-    #   been marked as irrelevant input.
+    # @!method get_entity(workspace_id:, entity:, export: nil, include_audit: nil)
+    # Get entity.
+    # Get information about an entity, optionally including all entity content.
     #
-    #   This operation is limited to 1000 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
+    #   With **export**=`false`, this operation is limited to 6000 requests per 5 minutes.
+    #   With **export**=`true`, the limit is 200 requests per 30 minutes. For more
+    #   information, see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param text [String] The text of a user input counterexample (for example, `What are you wearing?`).
-    # @return [nil]
-    def delete_counterexample(workspace_id:, text:)
+    # @param entity [String] The name of the entity.
+    # @param export [Boolean] Whether to include all element content in the returned data. If
+    #   **export**=`false`, the returned data includes only information about the element
+    #   itself. If **export**=`true`, all content, including subelements, is included.
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_entity(workspace_id:, entity:, export: nil, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
-      raise ArgumentError.new("text must be provided") if text.nil?
+      raise ArgumentError.new("entity must be provided") if entity.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_counterexample")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_entity")
+      headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
+        "version" => @version,
+        "export" => export,
+        "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/counterexamples/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(text)]
+      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
 
-      request(
-        method: "DELETE",
+      response = request(
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
         accept_json: true
       )
-      nil
+      response
     end
-    #########################
-    # Entities
-    #########################
 
     ##
     # @!method list_entities(workspace_id:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
@@ -1091,7 +1254,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_entities")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_entities")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -1116,48 +1280,48 @@ module IBMWatson
     end
 
     ##
-    # @!method create_entity(workspace_id:, entity:, description: nil, metadata: nil, values: nil, fuzzy_match: nil)
-    # Create entity.
-    # Create a new entity, or enable a system entity.
+    # @!method update_entity(workspace_id:, entity:, new_entity: nil, new_description: nil, new_metadata: nil, new_fuzzy_match: nil, new_values: nil)
+    # Update entity.
+    # Update an existing entity with new or modified data. You must provide component
+    #   objects defining the content of the updated entity.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
-    # @param entity [String] The name of the entity. This string must conform to the following restrictions:
+    # @param entity [String] The name of the entity.
+    # @param new_entity [String] The name of the entity. This string must conform to the following restrictions:
     #   - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
+    #   - It cannot begin with the reserved prefix `sys-`.
     #   - It must be no longer than 64 characters.
-    #
-    #   If you specify an entity name beginning with the reserved prefix `sys-`, it must
-    #   be the name of a system entity that you want to enable. (Any entity content
-    #   specified with the request is ignored.).
-    # @param description [String] The description of the entity. This string cannot contain carriage return,
+    # @param new_description [String] The description of the entity. This string cannot contain carriage return,
     #   newline, or tab characters, and it must be no longer than 128 characters.
-    # @param metadata [Object] Any metadata related to the value.
-    # @param values [Array[CreateValue]] An array of objects describing the entity values.
-    # @param fuzzy_match [Boolean] Whether to use fuzzy matching for the entity.
+    # @param new_metadata [Hash] Any metadata related to the entity.
+    # @param new_fuzzy_match [Boolean] Whether to use fuzzy matching for the entity.
+    # @param new_values [Array[CreateValue]] An array of objects describing the entity values.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_entity(workspace_id:, entity:, description: nil, metadata: nil, values: nil, fuzzy_match: nil)
+    def update_entity(workspace_id:, entity:, new_entity: nil, new_description: nil, new_metadata: nil, new_fuzzy_match: nil, new_values: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_entity")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_entity")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "entity" => entity,
-        "description" => description,
-        "metadata" => metadata,
-        "values" => values,
-        "fuzzy_match" => fuzzy_match
+        "entity" => new_entity,
+        "description" => new_description,
+        "metadata" => new_metadata,
+        "fuzzy_match" => new_fuzzy_match,
+        "values" => new_values
       }
 
-      method_url = "/v1/workspaces/%s/entities" % [ERB::Util.url_encode(workspace_id)]
+      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
 
       response = request(
         method: "POST",
@@ -1169,15 +1333,18 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Mentions
+    #########################
 
     ##
-    # @!method get_entity(workspace_id:, entity:, export: nil, include_audit: nil)
-    # Get entity.
-    # Get information about an entity, optionally including all entity content.
+    # @!method list_mentions(workspace_id:, entity:, export: nil, include_audit: nil)
+    # List entity mentions.
+    # List mentions for a contextual entity. An entity mention is an occurrence of a
+    #   contextual entity in the context of an intent user input example.
     #
-    #   With **export**=`false`, this operation is limited to 6000 requests per 5 minutes.
-    #   With **export**=`true`, the limit is 200 requests per 30 minutes. For more
-    #   information, see **Rate limiting**.
+    #   This operation is limited to 200 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
     # @param export [Boolean] Whether to include all element content in the returned data. If
@@ -1186,14 +1353,15 @@ module IBMWatson
     # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
     #   the response.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_entity(workspace_id:, entity:, export: nil, include_audit: nil)
+    def list_mentions(workspace_id:, entity:, export: nil, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_entity")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_mentions")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -1201,7 +1369,7 @@ module IBMWatson
         "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
+      method_url = "/v1/workspaces/%s/entities/%s/mentions" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
 
       response = request(
         method: "GET",
@@ -1212,49 +1380,63 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Values
+    #########################
 
     ##
-    # @!method update_entity(workspace_id:, entity:, new_entity: nil, new_description: nil, new_metadata: nil, new_fuzzy_match: nil, new_values: nil)
-    # Update entity.
-    # Update an existing entity with new or modified data. You must provide component
-    #   objects defining the content of the updated entity.
+    # @!method create_value(workspace_id:, entity:, value:, metadata: nil, value_type: nil, synonyms: nil, patterns: nil)
+    # Create entity value.
+    # Create a new value for an entity.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
-    # @param new_entity [String] The name of the entity. This string must conform to the following restrictions:
-    #   - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
-    #   - It cannot begin with the reserved prefix `sys-`.
+    # @param value [String] The text of the entity value. This string must conform to the following
+    #   restrictions:
+    #   - It cannot contain carriage return, newline, or tab characters.
+    #   - It cannot consist of only whitespace characters.
     #   - It must be no longer than 64 characters.
-    # @param new_description [String] The description of the entity. This string cannot contain carriage return,
-    #   newline, or tab characters, and it must be no longer than 128 characters.
-    # @param new_metadata [Object] Any metadata related to the entity.
-    # @param new_fuzzy_match [Boolean] Whether to use fuzzy matching for the entity.
-    # @param new_values [Array[CreateValue]] An array of entity values.
+    # @param metadata [Hash] Any metadata related to the entity value.
+    # @param value_type [String] Specifies the type of entity value.
+    # @param synonyms [Array[String]] An array of synonyms for the entity value. A value can specify either synonyms or
+    #   patterns (depending on the value type), but not both. A synonym must conform to
+    #   the following resrictions:
+    #   - It cannot contain carriage return, newline, or tab characters.
+    #   - It cannot consist of only whitespace characters.
+    #   - It must be no longer than 64 characters.
+    # @param patterns [Array[String]] An array of patterns for the entity value. A value can specify either synonyms or
+    #   patterns (depending on the value type), but not both. A pattern is a regular
+    #   expression no longer than 512 characters. For more information about how to
+    #   specify a pattern, see the
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#entities-create-dictionary-based).
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_entity(workspace_id:, entity:, new_entity: nil, new_description: nil, new_metadata: nil, new_fuzzy_match: nil, new_values: nil)
+    def create_value(workspace_id:, entity:, value:, metadata: nil, value_type: nil, synonyms: nil, patterns: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
+      raise ArgumentError.new("value must be provided") if value.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_entity")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_value")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "entity" => new_entity,
-        "description" => new_description,
-        "metadata" => new_metadata,
-        "fuzzy_match" => new_fuzzy_match,
-        "values" => new_values
+        "value" => value,
+        "metadata" => metadata,
+        "type" => value_type,
+        "synonyms" => synonyms,
+        "patterns" => patterns
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
+      method_url = "/v1/workspaces/%s/entities/%s/values" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
 
       response = request(
         method: "POST",
@@ -1268,29 +1450,33 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_entity(workspace_id:, entity:)
-    # Delete entity.
-    # Delete an entity from a workspace, or disable a system entity.
+    # @!method delete_value(workspace_id:, entity:, value:)
+    # Delete entity value.
+    # Delete a value from an entity.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
+    # @param value [String] The text of the entity value.
     # @return [nil]
-    def delete_entity(workspace_id:, entity:)
+    def delete_value(workspace_id:, entity:, value:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
+      raise ArgumentError.new("value must be provided") if value.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_entity")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_value")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
 
       request(
         method: "DELETE",
@@ -1301,34 +1487,34 @@ module IBMWatson
       )
       nil
     end
-    #########################
-    # Mentions
-    #########################
 
     ##
-    # @!method list_mentions(workspace_id:, entity:, export: nil, include_audit: nil)
-    # List entity mentions.
-    # List mentions for a contextual entity. An entity mention is an occurrence of a
-    #   contextual entity in the context of an intent user input example.
+    # @!method get_value(workspace_id:, entity:, value:, export: nil, include_audit: nil)
+    # Get entity value.
+    # Get information about an entity value.
     #
-    #   This operation is limited to 200 requests per 30 minutes. For more information,
+    #   This operation is limited to 6000 requests per 5 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
+    # @param value [String] The text of the entity value.
     # @param export [Boolean] Whether to include all element content in the returned data. If
     #   **export**=`false`, the returned data includes only information about the element
     #   itself. If **export**=`true`, all content, including subelements, is included.
     # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
     #   the response.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_mentions(workspace_id:, entity:, export: nil, include_audit: nil)
+    def get_value(workspace_id:, entity:, value:, export: nil, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
+      raise ArgumentError.new("value must be provided") if value.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_mentions")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_value")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -1336,7 +1522,7 @@ module IBMWatson
         "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/mentions" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
 
       response = request(
         method: "GET",
@@ -1347,9 +1533,6 @@ module IBMWatson
       )
       response
     end
-    #########################
-    # Values
-    #########################
 
     ##
     # @!method list_values(workspace_id:, entity:, export: nil, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
@@ -1378,7 +1561,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_values")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_values")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -1403,34 +1587,36 @@ module IBMWatson
     end
 
     ##
-    # @!method create_value(workspace_id:, entity:, value:, metadata: nil, synonyms: nil, patterns: nil, value_type: nil)
-    # Add entity value.
-    # Create a new value for an entity.
+    # @!method update_value(workspace_id:, entity:, value:, new_value: nil, new_metadata: nil, new_value_type: nil, new_synonyms: nil, new_patterns: nil)
+    # Update entity value.
+    # Update an existing entity value with new or modified data. You must provide
+    #   component objects defining the content of the updated entity value.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
-    # @param value [String] The text of the entity value. This string must conform to the following
+    # @param value [String] The text of the entity value.
+    # @param new_value [String] The text of the entity value. This string must conform to the following
     #   restrictions:
     #   - It cannot contain carriage return, newline, or tab characters.
     #   - It cannot consist of only whitespace characters.
     #   - It must be no longer than 64 characters.
-    # @param metadata [Object] Any metadata related to the entity value.
-    # @param synonyms [Array[String]] An array containing any synonyms for the entity value. You can provide either
-    #   synonyms or patterns (as indicated by **type**), but not both. A synonym must
-    #   conform to the following restrictions:
+    # @param new_metadata [Hash] Any metadata related to the entity value.
+    # @param new_value_type [String] Specifies the type of entity value.
+    # @param new_synonyms [Array[String]] An array of synonyms for the entity value. A value can specify either synonyms or
+    #   patterns (depending on the value type), but not both. A synonym must conform to
+    #   the following resrictions:
     #   - It cannot contain carriage return, newline, or tab characters.
     #   - It cannot consist of only whitespace characters.
     #   - It must be no longer than 64 characters.
-    # @param patterns [Array[String]] An array of patterns for the entity value. You can provide either synonyms or
-    #   patterns (as indicated by **type**), but not both. A pattern is a regular
+    # @param new_patterns [Array[String]] An array of patterns for the entity value. A value can specify either synonyms or
+    #   patterns (depending on the value type), but not both. A pattern is a regular
     #   expression no longer than 512 characters. For more information about how to
     #   specify a pattern, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#creating-entities).
-    # @param value_type [String] Specifies the type of value.
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#entities-create-dictionary-based).
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_value(workspace_id:, entity:, value:, metadata: nil, synonyms: nil, patterns: nil, value_type: nil)
+    def update_value(workspace_id:, entity:, value:, new_value: nil, new_metadata: nil, new_value_type: nil, new_synonyms: nil, new_patterns: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
@@ -1439,21 +1625,22 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_value")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_value")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "value" => value,
-        "metadata" => metadata,
-        "synonyms" => synonyms,
-        "patterns" => patterns,
-        "type" => value_type
+        "value" => new_value,
+        "metadata" => new_metadata,
+        "type" => new_value_type,
+        "synonyms" => new_synonyms,
+        "patterns" => new_patterns
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/values" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
 
       response = request(
         method: "POST",
@@ -1465,106 +1652,48 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Synonyms
+    #########################
 
     ##
-    # @!method get_value(workspace_id:, entity:, value:, export: nil, include_audit: nil)
-    # Get entity value.
-    # Get information about an entity value.
-    #
-    #   This operation is limited to 6000 requests per 5 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param entity [String] The name of the entity.
-    # @param value [String] The text of the entity value.
-    # @param export [Boolean] Whether to include all element content in the returned data. If
-    #   **export**=`false`, the returned data includes only information about the element
-    #   itself. If **export**=`true`, all content, including subelements, is included.
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_value(workspace_id:, entity:, value:, export: nil, include_audit: nil)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      raise ArgumentError.new("entity must be provided") if entity.nil?
-
-      raise ArgumentError.new("value must be provided") if value.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_value")
-
-      params = {
-        "version" => @version,
-        "export" => export,
-        "include_audit" => include_audit
-      }
-
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method update_value(workspace_id:, entity:, value:, new_value: nil, new_metadata: nil, new_type: nil, new_synonyms: nil, new_patterns: nil)
-    # Update entity value.
-    # Update an existing entity value with new or modified data. You must provide
-    #   component objects defining the content of the updated entity value.
+    # @!method create_synonym(workspace_id:, entity:, value:, synonym:)
+    # Create entity value synonym.
+    # Add a new synonym to an entity value.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
     # @param value [String] The text of the entity value.
-    # @param new_value [String] The text of the entity value. This string must conform to the following
-    #   restrictions:
-    #   - It cannot contain carriage return, newline, or tab characters.
-    #   - It cannot consist of only whitespace characters.
-    #   - It must be no longer than 64 characters.
-    # @param new_metadata [Object] Any metadata related to the entity value.
-    # @param new_type [String] Specifies the type of value.
-    # @param new_synonyms [Array[String]] An array of synonyms for the entity value. You can provide either synonyms or
-    #   patterns (as indicated by **type**), but not both. A synonym must conform to the
-    #   following resrictions:
+    # @param synonym [String] The text of the synonym. This string must conform to the following restrictions:
     #   - It cannot contain carriage return, newline, or tab characters.
     #   - It cannot consist of only whitespace characters.
     #   - It must be no longer than 64 characters.
-    # @param new_patterns [Array[String]] An array of patterns for the entity value. You can provide either synonyms or
-    #   patterns (as indicated by **type**), but not both. A pattern is a regular
-    #   expression no longer than 512 characters. For more information about how to
-    #   specify a pattern, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#creating-entities).
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_value(workspace_id:, entity:, value:, new_value: nil, new_metadata: nil, new_type: nil, new_synonyms: nil, new_patterns: nil)
+    def create_synonym(workspace_id:, entity:, value:, synonym:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       raise ArgumentError.new("value must be provided") if value.nil?
 
+      raise ArgumentError.new("synonym must be provided") if synonym.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_value")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_synonym")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
       data = {
-        "value" => new_value,
-        "metadata" => new_metadata,
-        "type" => new_type,
-        "synonyms" => new_synonyms,
-        "patterns" => new_patterns
+        "synonym" => synonym
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
 
       response = request(
         method: "POST",
@@ -1578,32 +1707,36 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_value(workspace_id:, entity:, value:)
-    # Delete entity value.
-    # Delete a value from an entity.
+    # @!method delete_synonym(workspace_id:, entity:, value:, synonym:)
+    # Delete entity value synonym.
+    # Delete a synonym from an entity value.
     #
     #   This operation is limited to 1000 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
     # @param value [String] The text of the entity value.
+    # @param synonym [String] The text of the synonym.
     # @return [nil]
-    def delete_value(workspace_id:, entity:, value:)
+    def delete_synonym(workspace_id:, entity:, value:, synonym:)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       raise ArgumentError.new("value must be provided") if value.nil?
 
+      raise ArgumentError.new("synonym must be provided") if synonym.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_value")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_synonym")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value), ERB::Util.url_encode(synonym)]
 
       request(
         method: "DELETE",
@@ -1614,49 +1747,41 @@ module IBMWatson
       )
       nil
     end
-    #########################
-    # Synonyms
-    #########################
 
     ##
-    # @!method list_synonyms(workspace_id:, entity:, value:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-    # List entity value synonyms.
-    # List the synonyms for an entity value.
+    # @!method get_synonym(workspace_id:, entity:, value:, synonym:, include_audit: nil)
+    # Get entity value synonym.
+    # Get information about a synonym of an entity value.
     #
-    #   This operation is limited to 2500 requests per 30 minutes. For more information,
+    #   This operation is limited to 6000 requests per 5 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
     # @param value [String] The text of the entity value.
-    # @param page_limit [Fixnum] The number of records to return in each page of results.
-    # @param include_count [Boolean] Whether to include information about the number of records returned.
-    # @param sort [String] The attribute by which returned entity value synonyms will be sorted. To reverse
-    #   the sort order, prefix the value with a minus sign (`-`).
-    # @param cursor [String] A token identifying the page of results to retrieve.
+    # @param synonym [String] The text of the synonym.
     # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
     #   the response.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_synonyms(workspace_id:, entity:, value:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+    def get_synonym(workspace_id:, entity:, value:, synonym:, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       raise ArgumentError.new("value must be provided") if value.nil?
 
+      raise ArgumentError.new("synonym must be provided") if synonym.nil?
+
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_synonyms")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_synonym")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "page_limit" => page_limit,
-        "include_count" => include_count,
-        "sort" => sort,
-        "cursor" => cursor,
         "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value), ERB::Util.url_encode(synonym)]
 
       response = request(
         method: "GET",
@@ -1669,87 +1794,45 @@ module IBMWatson
     end
 
     ##
-    # @!method create_synonym(workspace_id:, entity:, value:, synonym:)
-    # Add entity value synonym.
-    # Add a new synonym to an entity value.
-    #
-    #   This operation is limited to 1000 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param entity [String] The name of the entity.
-    # @param value [String] The text of the entity value.
-    # @param synonym [String] The text of the synonym. This string must conform to the following restrictions:
-    #   - It cannot contain carriage return, newline, or tab characters.
-    #   - It cannot consist of only whitespace characters.
-    #   - It must be no longer than 64 characters.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_synonym(workspace_id:, entity:, value:, synonym:)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      raise ArgumentError.new("entity must be provided") if entity.nil?
-
-      raise ArgumentError.new("value must be provided") if value.nil?
-
-      raise ArgumentError.new("synonym must be provided") if synonym.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_synonym")
-
-      params = {
-        "version" => @version
-      }
-
-      data = {
-        "synonym" => synonym
-      }
-
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
-
-      response = request(
-        method: "POST",
-        url: method_url,
-        headers: headers,
-        params: params,
-        json: data,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method get_synonym(workspace_id:, entity:, value:, synonym:, include_audit: nil)
-    # Get entity value synonym.
-    # Get information about a synonym of an entity value.
+    # @!method list_synonyms(workspace_id:, entity:, value:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+    # List entity value synonyms.
+    # List the synonyms for an entity value.
     #
-    #   This operation is limited to 6000 requests per 5 minutes. For more information,
+    #   This operation is limited to 2500 requests per 30 minutes. For more information,
     #   see **Rate limiting**.
     # @param workspace_id [String] Unique identifier of the workspace.
     # @param entity [String] The name of the entity.
     # @param value [String] The text of the entity value.
-    # @param synonym [String] The text of the synonym.
+    # @param page_limit [Fixnum] The number of records to return in each page of results.
+    # @param include_count [Boolean] Whether to include information about the number of records returned.
+    # @param sort [String] The attribute by which returned entity value synonyms will be sorted. To reverse
+    #   the sort order, prefix the value with a minus sign (`-`).
+    # @param cursor [String] A token identifying the page of results to retrieve.
     # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
     #   the response.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_synonym(workspace_id:, entity:, value:, synonym:, include_audit: nil)
+    def list_synonyms(workspace_id:, entity:, value:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("entity must be provided") if entity.nil?
 
       raise ArgumentError.new("value must be provided") if value.nil?
 
-      raise ArgumentError.new("synonym must be provided") if synonym.nil?
-
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_synonym")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_synonyms")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
+        "page_limit" => page_limit,
+        "include_count" => include_count,
+        "sort" => sort,
+        "cursor" => cursor,
         "include_audit" => include_audit
       }
 
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value), ERB::Util.url_encode(synonym)]
+      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value)]
 
       response = request(
         method: "GET",
@@ -1788,7 +1871,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_synonym")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_synonym")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -1810,97 +1894,12 @@ module IBMWatson
       )
       response
     end
-
-    ##
-    # @!method delete_synonym(workspace_id:, entity:, value:, synonym:)
-    # Delete entity value synonym.
-    # Delete a synonym from an entity value.
-    #
-    #   This operation is limited to 1000 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param entity [String] The name of the entity.
-    # @param value [String] The text of the entity value.
-    # @param synonym [String] The text of the synonym.
-    # @return [nil]
-    def delete_synonym(workspace_id:, entity:, value:, synonym:)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      raise ArgumentError.new("entity must be provided") if entity.nil?
-
-      raise ArgumentError.new("value must be provided") if value.nil?
-
-      raise ArgumentError.new("synonym must be provided") if synonym.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_synonym")
-
-      params = {
-        "version" => @version
-      }
-
-      method_url = "/v1/workspaces/%s/entities/%s/values/%s/synonyms/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(entity), ERB::Util.url_encode(value), ERB::Util.url_encode(synonym)]
-
-      request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      nil
-    end
     #########################
     # Dialog nodes
     #########################
 
     ##
-    # @!method list_dialog_nodes(workspace_id:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-    # List dialog nodes.
-    # List the dialog nodes for a workspace.
-    #
-    #   This operation is limited to 2500 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param page_limit [Fixnum] The number of records to return in each page of results.
-    # @param include_count [Boolean] Whether to include information about the number of records returned.
-    # @param sort [String] The attribute by which returned dialog nodes will be sorted. To reverse the sort
-    #   order, prefix the value with a minus sign (`-`).
-    # @param cursor [String] A token identifying the page of results to retrieve.
-    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
-    #   the response.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_dialog_nodes(workspace_id:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_dialog_nodes")
-
-      params = {
-        "version" => @version,
-        "page_limit" => page_limit,
-        "include_count" => include_count,
-        "sort" => sort,
-        "cursor" => cursor,
-        "include_audit" => include_audit
-      }
-
-      method_url = "/v1/workspaces/%s/dialog_nodes" % [ERB::Util.url_encode(workspace_id)]
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method create_dialog_node(workspace_id:, dialog_node:, description: nil, conditions: nil, parent: nil, previous_sibling: nil, output: nil, context: nil, metadata: nil, next_step: nil, actions: nil, title: nil, node_type: nil, event_name: nil, variable: nil, digress_in: nil, digress_out: nil, digress_out_slots: nil, user_label: nil)
+    # @!method create_dialog_node(workspace_id:, dialog_node:, description: nil, conditions: nil, parent: nil, previous_sibling: nil, output: nil, context: nil, metadata: nil, next_step: nil, title: nil, node_type: nil, event_name: nil, variable: nil, actions: nil, digress_in: nil, digress_out: nil, digress_out_slots: nil, user_label: nil)
     # Create dialog node.
     # Create a new dialog node.
     #
@@ -1916,15 +1915,16 @@ module IBMWatson
     # @param conditions [String] The condition that will trigger the dialog node. This string cannot contain
     #   carriage return, newline, or tab characters, and it must be no longer than 2048
     #   characters.
-    # @param parent [String] The ID of the parent dialog node.
-    # @param previous_sibling [String] The ID of the previous dialog node.
+    # @param parent [String] The ID of the parent dialog node. This property is omitted if the dialog node has
+    #   no parent.
+    # @param previous_sibling [String] The ID of the previous sibling dialog node. This property is omitted if the dialog
+    #   node has no previous sibling.
     # @param output [DialogNodeOutput] The output of the dialog node. For more information about how to specify dialog
     #   node output, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
-    # @param context [Object] The context for the dialog node.
-    # @param metadata [Object] The metadata for the dialog node.
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#dialog-overview-responses).
+    # @param context [Hash] The context for the dialog node.
+    # @param metadata [Hash] The metadata for the dialog node.
     # @param next_step [DialogNodeNextStep] The next step to execute following this dialog node.
-    # @param actions [Array[DialogNodeAction]] An array of objects describing any actions to be invoked by the dialog node.
     # @param title [String] The alias used to identify the dialog node. This string must conform to the
     #   following restrictions:
     #   - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot
@@ -1933,20 +1933,22 @@ module IBMWatson
     # @param node_type [String] How the dialog node is processed.
     # @param event_name [String] How an `event_handler` node is processed.
     # @param variable [String] The location in the dialog context where output is stored.
+    # @param actions [Array[DialogNodeAction]] An array of objects describing any actions to be invoked by the dialog node.
     # @param digress_in [String] Whether this top-level dialog node can be digressed into.
     # @param digress_out [String] Whether this dialog node can be returned to after a digression.
     # @param digress_out_slots [String] Whether the user can digress to top-level nodes while filling out slots.
     # @param user_label [String] A label that can be displayed externally to describe the purpose of the node to
     #   users. This string must be no longer than 512 characters.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_dialog_node(workspace_id:, dialog_node:, description: nil, conditions: nil, parent: nil, previous_sibling: nil, output: nil, context: nil, metadata: nil, next_step: nil, actions: nil, title: nil, node_type: nil, event_name: nil, variable: nil, digress_in: nil, digress_out: nil, digress_out_slots: nil, user_label: nil)
+    def create_dialog_node(workspace_id:, dialog_node:, description: nil, conditions: nil, parent: nil, previous_sibling: nil, output: nil, context: nil, metadata: nil, next_step: nil, title: nil, node_type: nil, event_name: nil, variable: nil, actions: nil, digress_in: nil, digress_out: nil, digress_out_slots: nil, user_label: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("dialog_node must be provided") if dialog_node.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "create_dialog_node")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "create_dialog_node")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -1962,11 +1964,11 @@ module IBMWatson
         "context" => context,
         "metadata" => metadata,
         "next_step" => next_step,
-        "actions" => actions,
         "title" => title,
         "type" => node_type,
         "event_name" => event_name,
         "variable" => variable,
+        "actions" => actions,
         "digress_in" => digress_in,
         "digress_out" => digress_out,
         "digress_out_slots" => digress_out_slots,
@@ -1986,6 +1988,42 @@ module IBMWatson
       response
     end
 
+    ##
+    # @!method delete_dialog_node(workspace_id:, dialog_node:)
+    # Delete dialog node.
+    # Delete a dialog node from a workspace.
+    #
+    #   This operation is limited to 500 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param dialog_node [String] The dialog node ID (for example, `get_order`).
+    # @return [nil]
+    def delete_dialog_node(workspace_id:, dialog_node:)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      raise ArgumentError.new("dialog_node must be provided") if dialog_node.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_dialog_node")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/workspaces/%s/dialog_nodes/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(dialog_node)]
+
+      request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      nil
+    end
+
     ##
     # @!method get_dialog_node(workspace_id:, dialog_node:, include_audit: nil)
     # Get dialog node.
@@ -2005,7 +2043,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "get_dialog_node")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "get_dialog_node")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
@@ -2025,7 +2064,52 @@ module IBMWatson
     end
 
     ##
-    # @!method update_dialog_node(workspace_id:, dialog_node:, new_dialog_node: nil, new_description: nil, new_conditions: nil, new_parent: nil, new_previous_sibling: nil, new_output: nil, new_context: nil, new_metadata: nil, new_next_step: nil, new_title: nil, new_type: nil, new_event_name: nil, new_variable: nil, new_actions: nil, new_digress_in: nil, new_digress_out: nil, new_digress_out_slots: nil, new_user_label: nil)
+    # @!method list_dialog_nodes(workspace_id:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+    # List dialog nodes.
+    # List the dialog nodes for a workspace.
+    #
+    #   This operation is limited to 2500 requests per 30 minutes. For more information,
+    #   see **Rate limiting**.
+    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param page_limit [Fixnum] The number of records to return in each page of results.
+    # @param include_count [Boolean] Whether to include information about the number of records returned.
+    # @param sort [String] The attribute by which returned dialog nodes will be sorted. To reverse the sort
+    #   order, prefix the value with a minus sign (`-`).
+    # @param cursor [String] A token identifying the page of results to retrieve.
+    # @param include_audit [Boolean] Whether to include the audit properties (`created` and `updated` timestamps) in
+    #   the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def list_dialog_nodes(workspace_id:, page_limit: nil, include_count: nil, sort: nil, cursor: nil, include_audit: nil)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_dialog_nodes")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "page_limit" => page_limit,
+        "include_count" => include_count,
+        "sort" => sort,
+        "cursor" => cursor,
+        "include_audit" => include_audit
+      }
+
+      method_url = "/v1/workspaces/%s/dialog_nodes" % [ERB::Util.url_encode(workspace_id)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
+    ##
+    # @!method update_dialog_node(workspace_id:, dialog_node:, new_dialog_node: nil, new_description: nil, new_conditions: nil, new_parent: nil, new_previous_sibling: nil, new_output: nil, new_context: nil, new_metadata: nil, new_next_step: nil, new_title: nil, new_node_type: nil, new_event_name: nil, new_variable: nil, new_actions: nil, new_digress_in: nil, new_digress_out: nil, new_digress_out_slots: nil, new_user_label: nil)
     # Update dialog node.
     # Update an existing dialog node with new or modified data.
     #
@@ -2042,20 +2126,22 @@ module IBMWatson
     # @param new_conditions [String] The condition that will trigger the dialog node. This string cannot contain
     #   carriage return, newline, or tab characters, and it must be no longer than 2048
     #   characters.
-    # @param new_parent [String] The ID of the parent dialog node.
-    # @param new_previous_sibling [String] The ID of the previous sibling dialog node.
+    # @param new_parent [String] The ID of the parent dialog node. This property is omitted if the dialog node has
+    #   no parent.
+    # @param new_previous_sibling [String] The ID of the previous sibling dialog node. This property is omitted if the dialog
+    #   node has no previous sibling.
     # @param new_output [DialogNodeOutput] The output of the dialog node. For more information about how to specify dialog
     #   node output, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
-    # @param new_context [Object] The context for the dialog node.
-    # @param new_metadata [Object] The metadata for the dialog node.
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#dialog-overview-responses).
+    # @param new_context [Hash] The context for the dialog node.
+    # @param new_metadata [Hash] The metadata for the dialog node.
     # @param new_next_step [DialogNodeNextStep] The next step to execute following this dialog node.
     # @param new_title [String] The alias used to identify the dialog node. This string must conform to the
     #   following restrictions:
     #   - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot
     #   characters.
     #   - It must be no longer than 64 characters.
-    # @param new_type [String] How the dialog node is processed.
+    # @param new_node_type [String] How the dialog node is processed.
     # @param new_event_name [String] How an `event_handler` node is processed.
     # @param new_variable [String] The location in the dialog context where output is stored.
     # @param new_actions [Array[DialogNodeAction]] An array of objects describing any actions to be invoked by the dialog node.
@@ -2065,14 +2151,15 @@ module IBMWatson
     # @param new_user_label [String] A label that can be displayed externally to describe the purpose of the node to
     #   users. This string must be no longer than 512 characters.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_dialog_node(workspace_id:, dialog_node:, new_dialog_node: nil, new_description: nil, new_conditions: nil, new_parent: nil, new_previous_sibling: nil, new_output: nil, new_context: nil, new_metadata: nil, new_next_step: nil, new_title: nil, new_type: nil, new_event_name: nil, new_variable: nil, new_actions: nil, new_digress_in: nil, new_digress_out: nil, new_digress_out_slots: nil, new_user_label: nil)
+    def update_dialog_node(workspace_id:, dialog_node:, new_dialog_node: nil, new_description: nil, new_conditions: nil, new_parent: nil, new_previous_sibling: nil, new_output: nil, new_context: nil, new_metadata: nil, new_next_step: nil, new_title: nil, new_node_type: nil, new_event_name: nil, new_variable: nil, new_actions: nil, new_digress_in: nil, new_digress_out: nil, new_digress_out_slots: nil, new_user_label: nil)
       raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       raise ArgumentError.new("dialog_node must be provided") if dialog_node.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "update_dialog_node")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "update_dialog_node")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
@@ -2089,7 +2176,7 @@ module IBMWatson
         "metadata" => new_metadata,
         "next_step" => new_next_step,
         "title" => new_title,
-        "type" => new_type,
+        "type" => new_node_type,
         "event_name" => new_event_name,
         "variable" => new_variable,
         "actions" => new_actions,
@@ -2111,78 +2198,45 @@ module IBMWatson
       )
       response
     end
-
-    ##
-    # @!method delete_dialog_node(workspace_id:, dialog_node:)
-    # Delete dialog node.
-    # Delete a dialog node from a workspace.
-    #
-    #   This operation is limited to 500 requests per 30 minutes. For more information,
-    #   see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
-    # @param dialog_node [String] The dialog node ID (for example, `get_order`).
-    # @return [nil]
-    def delete_dialog_node(workspace_id:, dialog_node:)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
-
-      raise ArgumentError.new("dialog_node must be provided") if dialog_node.nil?
-
-      headers = {
-      }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_dialog_node")
-
-      params = {
-        "version" => @version
-      }
-
-      method_url = "/v1/workspaces/%s/dialog_nodes/%s" % [ERB::Util.url_encode(workspace_id), ERB::Util.url_encode(dialog_node)]
-
-      request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      nil
-    end
     #########################
     # Logs
     #########################
 
     ##
-    # @!method list_logs(workspace_id:, sort: nil, filter: nil, page_limit: nil, cursor: nil)
-    # List log events in a workspace.
-    # List the events from the log of a specific workspace.
+    # @!method list_all_logs(filter:, sort: nil, page_limit: nil, cursor: nil)
+    # List log events in all workspaces.
+    # List the events from the logs of all workspaces in the service instance.
     #
     #   If **cursor** is not specified, this operation is limited to 40 requests per 30
     #   minutes. If **cursor** is specified, the limit is 120 requests per minute. For
     #   more information, see **Rate limiting**.
-    # @param workspace_id [String] Unique identifier of the workspace.
+    # @param filter [String] A cacheable parameter that limits the results to those matching the specified
+    #   filter. You must specify a filter query that includes a value for `language`, as
+    #   well as a value for `workspace_id` or `request.context.metadata.deployment`. For
+    #   more information, see the
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-reference-syntax).
     # @param sort [String] How to sort the returned log events. You can sort by **request_timestamp**. To
     #   reverse the sort order, prefix the parameter value with a minus sign (`-`).
-    # @param filter [String] A cacheable parameter that limits the results to those matching the specified
-    #   filter. For more information, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).
     # @param page_limit [Fixnum] The number of records to return in each page of results.
     # @param cursor [String] A token identifying the page of results to retrieve.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_logs(workspace_id:, sort: nil, filter: nil, page_limit: nil, cursor: nil)
-      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
+    def list_all_logs(filter:, sort: nil, page_limit: nil, cursor: nil)
+      raise ArgumentError.new("filter must be provided") if filter.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_logs")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_all_logs")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "sort" => sort,
         "filter" => filter,
+        "sort" => sort,
         "page_limit" => page_limit,
         "cursor" => cursor
       }
 
-      method_url = "/v1/workspaces/%s/logs" % [ERB::Util.url_encode(workspace_id)]
+      method_url = "/v1/logs"
 
       response = request(
         method: "GET",
@@ -2195,39 +2249,39 @@ module IBMWatson
     end
 
     ##
-    # @!method list_all_logs(filter:, sort: nil, page_limit: nil, cursor: nil)
-    # List log events in all workspaces.
-    # List the events from the logs of all workspaces in the service instance.
+    # @!method list_logs(workspace_id:, sort: nil, filter: nil, page_limit: nil, cursor: nil)
+    # List log events in a workspace.
+    # List the events from the log of a specific workspace.
     #
     #   If **cursor** is not specified, this operation is limited to 40 requests per 30
     #   minutes. If **cursor** is specified, the limit is 120 requests per minute. For
     #   more information, see **Rate limiting**.
-    # @param filter [String] A cacheable parameter that limits the results to those matching the specified
-    #   filter. You must specify a filter query that includes a value for `language`, as
-    #   well as a value for `workspace_id` or `request.context.metadata.deployment`. For
-    #   more information, see the
-    #   [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).
+    # @param workspace_id [String] Unique identifier of the workspace.
     # @param sort [String] How to sort the returned log events. You can sort by **request_timestamp**. To
     #   reverse the sort order, prefix the parameter value with a minus sign (`-`).
+    # @param filter [String] A cacheable parameter that limits the results to those matching the specified
+    #   filter. For more information, see the
+    #   [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-reference-syntax).
     # @param page_limit [Fixnum] The number of records to return in each page of results.
     # @param cursor [String] A token identifying the page of results to retrieve.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_all_logs(filter:, sort: nil, page_limit: nil, cursor: nil)
-      raise ArgumentError.new("filter must be provided") if filter.nil?
+    def list_logs(workspace_id:, sort: nil, filter: nil, page_limit: nil, cursor: nil)
+      raise ArgumentError.new("workspace_id must be provided") if workspace_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "list_all_logs")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "list_logs")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "filter" => filter,
         "sort" => sort,
+        "filter" => filter,
         "page_limit" => page_limit,
         "cursor" => cursor
       }
 
-      method_url = "/v1/logs"
+      method_url = "/v1/workspaces/%s/logs" % [ERB::Util.url_encode(workspace_id)]
 
       response = request(
         method: "GET",
@@ -2259,7 +2313,8 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_sdk_headers(headers: headers, service_name: "conversation", service_version: "V1", operation_id: "delete_user_data")
+      sdk_headers = Common.new.get_sdk_headers("conversation", "V1", "delete_user_data")
+      headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,