ruby-esi 0.5.0 → 0.6.0

data/lib/ruby-esi/api/universe_api.rb

@@ -3,12 +3,15 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.17
+The version of the OpenAPI document: 1.33
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.13.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.42
 =end
 
+require 'cgi'
+
 module ESI
   class UniverseApi
     attr_accessor :api_client
@@ -19,10 +22,10 @@ module ESI
     # Get ancestries
     # Get all character ancestries  --- Alternate route: `/legacy/universe/ancestries/`  Alternate route: `/v1/universe/ancestries/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<GetUniverseAncestries200Ok>]
     def get_universe_ancestries(opts = {})
       data, _status_code, _headers = get_universe_ancestries_with_http_info(opts)
@@ -32,23 +35,26 @@ module ESI
     # Get ancestries
     # Get all character ancestries  --- Alternate route: &#x60;/legacy/universe/ancestries/&#x60;  Alternate route: &#x60;/v1/universe/ancestries/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(Array<GetUniverseAncestries200Ok>, Integer, Hash)>] Array<GetUniverseAncestries200Ok> data, response status code and response headers
     def get_universe_ancestries_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_ancestries ...'
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/ancestries/'
@@ -61,7 +67,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -69,29 +75,36 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseAncestries200Ok>'
 
-      return_type = opts[:return_type] || 'Array<GetUniverseAncestries200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_ancestries",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_ancestries\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get asteroid belt information
     # Get information on an asteroid belt  --- Alternate route: `/legacy/universe/asteroid_belts/{asteroid_belt_id}/`  Alternate route: `/v1/universe/asteroid_belts/{asteroid_belt_id}/`  --- This route expires daily at 11:05
-    # @param asteroid_belt_id asteroid_belt_id integer
+    # @param asteroid_belt_id [Integer] asteroid_belt_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseAsteroidBeltsAsteroidBeltIdOk]
     def get_universe_asteroid_belts_asteroid_belt_id(asteroid_belt_id, opts = {})
@@ -101,9 +114,9 @@ module ESI
 
     # Get asteroid belt information
     # Get information on an asteroid belt  --- Alternate route: &#x60;/legacy/universe/asteroid_belts/{asteroid_belt_id}/&#x60;  Alternate route: &#x60;/v1/universe/asteroid_belts/{asteroid_belt_id}/&#x60;  --- This route expires daily at 11:05
-    # @param asteroid_belt_id asteroid_belt_id integer
+    # @param asteroid_belt_id [Integer] asteroid_belt_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseAsteroidBeltsAsteroidBeltIdOk, Integer, Hash)>] GetUniverseAsteroidBeltsAsteroidBeltIdOk data, response status code and response headers
     def get_universe_asteroid_belts_asteroid_belt_id_with_http_info(asteroid_belt_id, opts = {})
@@ -114,11 +127,12 @@ module ESI
       if @api_client.config.client_side_validation && asteroid_belt_id.nil?
         fail ArgumentError, "Missing the required parameter 'asteroid_belt_id' when calling UniverseApi.get_universe_asteroid_belts_asteroid_belt_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/asteroid_belts/{asteroid_belt_id}/'.sub('{' + 'asteroid_belt_id' + '}', asteroid_belt_id.to_s)
+      local_var_path = '/universe/asteroid_belts/{asteroid_belt_id}/'.sub('{' + 'asteroid_belt_id' + '}', CGI.escape(asteroid_belt_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -127,38 +141,45 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseAsteroidBeltsAsteroidBeltIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseAsteroidBeltsAsteroidBeltIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_asteroid_belts_asteroid_belt_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_asteroid_belts_asteroid_belt_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get bloodlines
     # Get a list of bloodlines  --- Alternate route: `/legacy/universe/bloodlines/`  Alternate route: `/v1/universe/bloodlines/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<GetUniverseBloodlines200Ok>]
     def get_universe_bloodlines(opts = {})
       data, _status_code, _headers = get_universe_bloodlines_with_http_info(opts)
@@ -168,23 +189,26 @@ module ESI
     # Get bloodlines
     # Get a list of bloodlines  --- Alternate route: &#x60;/legacy/universe/bloodlines/&#x60;  Alternate route: &#x60;/v1/universe/bloodlines/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(Array<GetUniverseBloodlines200Ok>, Integer, Hash)>] Array<GetUniverseBloodlines200Ok> data, response status code and response headers
     def get_universe_bloodlines_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_bloodlines ...'
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/bloodlines/'
@@ -197,7 +221,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -205,28 +229,35 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseBloodlines200Ok>'
 
-      return_type = opts[:return_type] || 'Array<GetUniverseBloodlines200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_bloodlines",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_bloodlines\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get item categories
     # Get a list of item categories  --- Alternate route: `/legacy/universe/categories/`  Alternate route: `/v1/universe/categories/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
     def get_universe_categories(opts = {})
@@ -237,15 +268,16 @@ module ESI
     # Get item categories
     # Get a list of item categories  --- Alternate route: &#x60;/legacy/universe/categories/&#x60;  Alternate route: &#x60;/v1/universe/categories/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_categories_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_categories ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/categories/'
@@ -257,39 +289,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_categories",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_categories\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get item category information
     # Get information of an item category  --- Alternate route: `/legacy/universe/categories/{category_id}/`  Alternate route: `/v1/universe/categories/{category_id}/`  --- This route expires daily at 11:05
-    # @param category_id An Eve item category ID
+    # @param category_id [Integer] An Eve item category ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseCategoriesCategoryIdOk]
     def get_universe_categories_category_id(category_id, opts = {})
       data, _status_code, _headers = get_universe_categories_category_id_with_http_info(category_id, opts)
@@ -298,12 +337,12 @@ module ESI
 
     # Get item category information
     # Get information of an item category  --- Alternate route: &#x60;/legacy/universe/categories/{category_id}/&#x60;  Alternate route: &#x60;/v1/universe/categories/{category_id}/&#x60;  --- This route expires daily at 11:05
-    # @param category_id An Eve item category ID
+    # @param category_id [Integer] An Eve item category ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseCategoriesCategoryIdOk, Integer, Hash)>] GetUniverseCategoriesCategoryIdOk data, response status code and response headers
     def get_universe_categories_category_id_with_http_info(category_id, opts = {})
       if @api_client.config.debugging
@@ -313,17 +352,20 @@ module ESI
       if @api_client.config.client_side_validation && category_id.nil?
         fail ArgumentError, "Missing the required parameter 'category_id' when calling UniverseApi.get_universe_categories_category_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/categories/{category_id}/'.sub('{' + 'category_id' + '}', category_id.to_s)
+      local_var_path = '/universe/categories/{category_id}/'.sub('{' + 'category_id' + '}', CGI.escape(category_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -333,7 +375,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -341,28 +383,35 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'GetUniverseCategoriesCategoryIdOk' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseCategoriesCategoryIdOk'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_categories_category_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_categories_category_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get constellations
     # Get a list of constellations  --- Alternate route: `/legacy/universe/constellations/`  Alternate route: `/v1/universe/constellations/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
     def get_universe_constellations(opts = {})
@@ -373,15 +422,16 @@ module ESI
     # Get constellations
     # Get a list of constellations  --- Alternate route: &#x60;/legacy/universe/constellations/&#x60;  Alternate route: &#x60;/v1/universe/constellations/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_constellations_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_constellations ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/constellations/'
@@ -393,39 +443,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_constellations",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_constellations\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get constellation information
     # Get information on a constellation  --- Alternate route: `/legacy/universe/constellations/{constellation_id}/`  Alternate route: `/v1/universe/constellations/{constellation_id}/`  --- This route expires daily at 11:05
-    # @param constellation_id constellation_id integer
+    # @param constellation_id [Integer] constellation_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseConstellationsConstellationIdOk]
     def get_universe_constellations_constellation_id(constellation_id, opts = {})
       data, _status_code, _headers = get_universe_constellations_constellation_id_with_http_info(constellation_id, opts)
@@ -434,12 +491,12 @@ module ESI
 
     # Get constellation information
     # Get information on a constellation  --- Alternate route: &#x60;/legacy/universe/constellations/{constellation_id}/&#x60;  Alternate route: &#x60;/v1/universe/constellations/{constellation_id}/&#x60;  --- This route expires daily at 11:05
-    # @param constellation_id constellation_id integer
+    # @param constellation_id [Integer] constellation_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseConstellationsConstellationIdOk, Integer, Hash)>] GetUniverseConstellationsConstellationIdOk data, response status code and response headers
     def get_universe_constellations_constellation_id_with_http_info(constellation_id, opts = {})
       if @api_client.config.debugging
@@ -449,17 +506,20 @@ module ESI
       if @api_client.config.client_side_validation && constellation_id.nil?
         fail ArgumentError, "Missing the required parameter 'constellation_id' when calling UniverseApi.get_universe_constellations_constellation_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/constellations/{constellation_id}/'.sub('{' + 'constellation_id' + '}', constellation_id.to_s)
+      local_var_path = '/universe/constellations/{constellation_id}/'.sub('{' + 'constellation_id' + '}', CGI.escape(constellation_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -469,7 +529,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -477,31 +537,38 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseConstellationsConstellationIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseConstellationsConstellationIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_constellations_constellation_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_constellations_constellation_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get factions
     # Get a list of factions  --- Alternate route: `/dev/universe/factions/`  Alternate route: `/v2/universe/factions/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<GetUniverseFactions200Ok>]
     def get_universe_factions(opts = {})
       data, _status_code, _headers = get_universe_factions_with_http_info(opts)
@@ -511,23 +578,26 @@ module ESI
     # Get factions
     # Get a list of factions  --- Alternate route: &#x60;/dev/universe/factions/&#x60;  Alternate route: &#x60;/v2/universe/factions/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(Array<GetUniverseFactions200Ok>, Integer, Hash)>] Array<GetUniverseFactions200Ok> data, response status code and response headers
     def get_universe_factions_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_factions ...'
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/factions/'
@@ -540,7 +610,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -548,28 +618,35 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseFactions200Ok>'
 
-      return_type = opts[:return_type] || 'Array<GetUniverseFactions200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_factions",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_factions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get graphics
     # Get a list of graphics  --- Alternate route: `/legacy/universe/graphics/`  Alternate route: `/v1/universe/graphics/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
     def get_universe_graphics(opts = {})
@@ -580,15 +657,16 @@ module ESI
     # Get graphics
     # Get a list of graphics  --- Alternate route: &#x60;/legacy/universe/graphics/&#x60;  Alternate route: &#x60;/v1/universe/graphics/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_graphics_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_graphics ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/graphics/'
@@ -600,36 +678,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_graphics",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_graphics\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get graphic information
     # Get information on a graphic  --- Alternate route: `/dev/universe/graphics/{graphic_id}/`  Alternate route: `/legacy/universe/graphics/{graphic_id}/`  Alternate route: `/v1/universe/graphics/{graphic_id}/`  --- This route expires daily at 11:05
-    # @param graphic_id graphic_id integer
+    # @param graphic_id [Integer] graphic_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseGraphicsGraphicIdOk]
     def get_universe_graphics_graphic_id(graphic_id, opts = {})
@@ -639,9 +724,9 @@ module ESI
 
     # Get graphic information
     # Get information on a graphic  --- Alternate route: &#x60;/dev/universe/graphics/{graphic_id}/&#x60;  Alternate route: &#x60;/legacy/universe/graphics/{graphic_id}/&#x60;  Alternate route: &#x60;/v1/universe/graphics/{graphic_id}/&#x60;  --- This route expires daily at 11:05
-    # @param graphic_id graphic_id integer
+    # @param graphic_id [Integer] graphic_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseGraphicsGraphicIdOk, Integer, Hash)>] GetUniverseGraphicsGraphicIdOk data, response status code and response headers
     def get_universe_graphics_graphic_id_with_http_info(graphic_id, opts = {})
@@ -652,11 +737,12 @@ module ESI
       if @api_client.config.client_side_validation && graphic_id.nil?
         fail ArgumentError, "Missing the required parameter 'graphic_id' when calling UniverseApi.get_universe_graphics_graphic_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/graphics/{graphic_id}/'.sub('{' + 'graphic_id' + '}', graphic_id.to_s)
+      local_var_path = '/universe/graphics/{graphic_id}/'.sub('{' + 'graphic_id' + '}', CGI.escape(graphic_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -665,35 +751,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'GetUniverseGraphicsGraphicIdOk' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseGraphicsGraphicIdOk'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_graphics_graphic_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_graphics_graphic_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get item groups
     # Get a list of item groups  --- Alternate route: `/legacy/universe/groups/`  Alternate route: `/v1/universe/groups/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return (default to 1)
     # @return [Array<Integer>]
@@ -705,17 +798,22 @@ module ESI
     # Get item groups
     # Get a list of item groups  --- Alternate route: &#x60;/legacy/universe/groups/&#x60;  Alternate route: &#x60;/v1/universe/groups/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [Integer] :page Which page of results to return
+    # @option opts [Integer] :page Which page of results to return (default to 1)
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_groups_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_groups ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling UniverseApi.get_universe_groups, must be greater than or equal to 1.'
+      end
+
       # resource path
       local_var_path = '/universe/groups/'
 
@@ -727,39 +825,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_groups",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_groups\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get item group information
     # Get information on an item group  --- Alternate route: `/dev/universe/groups/{group_id}/`  Alternate route: `/legacy/universe/groups/{group_id}/`  Alternate route: `/v1/universe/groups/{group_id}/`  --- This route expires daily at 11:05
-    # @param group_id An Eve item group ID
+    # @param group_id [Integer] An Eve item group ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseGroupsGroupIdOk]
     def get_universe_groups_group_id(group_id, opts = {})
       data, _status_code, _headers = get_universe_groups_group_id_with_http_info(group_id, opts)
@@ -768,12 +873,12 @@ module ESI
 
     # Get item group information
     # Get information on an item group  --- Alternate route: &#x60;/dev/universe/groups/{group_id}/&#x60;  Alternate route: &#x60;/legacy/universe/groups/{group_id}/&#x60;  Alternate route: &#x60;/v1/universe/groups/{group_id}/&#x60;  --- This route expires daily at 11:05
-    # @param group_id An Eve item group ID
+    # @param group_id [Integer] An Eve item group ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseGroupsGroupIdOk, Integer, Hash)>] GetUniverseGroupsGroupIdOk data, response status code and response headers
     def get_universe_groups_group_id_with_http_info(group_id, opts = {})
       if @api_client.config.debugging
@@ -783,17 +888,20 @@ module ESI
       if @api_client.config.client_side_validation && group_id.nil?
         fail ArgumentError, "Missing the required parameter 'group_id' when calling UniverseApi.get_universe_groups_group_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/groups/{group_id}/'.sub('{' + 'group_id' + '}', group_id.to_s)
+      local_var_path = '/universe/groups/{group_id}/'.sub('{' + 'group_id' + '}', CGI.escape(group_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -803,7 +911,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -811,29 +919,36 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseGroupsGroupIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseGroupsGroupIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_groups_group_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_groups_group_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get moon information
     # Get information on a moon  --- Alternate route: `/legacy/universe/moons/{moon_id}/`  Alternate route: `/v1/universe/moons/{moon_id}/`  --- This route expires daily at 11:05
-    # @param moon_id moon_id integer
+    # @param moon_id [Integer] moon_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseMoonsMoonIdOk]
     def get_universe_moons_moon_id(moon_id, opts = {})
@@ -843,9 +958,9 @@ module ESI
 
     # Get moon information
     # Get information on a moon  --- Alternate route: &#x60;/legacy/universe/moons/{moon_id}/&#x60;  Alternate route: &#x60;/v1/universe/moons/{moon_id}/&#x60;  --- This route expires daily at 11:05
-    # @param moon_id moon_id integer
+    # @param moon_id [Integer] moon_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseMoonsMoonIdOk, Integer, Hash)>] GetUniverseMoonsMoonIdOk data, response status code and response headers
     def get_universe_moons_moon_id_with_http_info(moon_id, opts = {})
@@ -856,11 +971,12 @@ module ESI
       if @api_client.config.client_side_validation && moon_id.nil?
         fail ArgumentError, "Missing the required parameter 'moon_id' when calling UniverseApi.get_universe_moons_moon_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/moons/{moon_id}/'.sub('{' + 'moon_id' + '}', moon_id.to_s)
+      local_var_path = '/universe/moons/{moon_id}/'.sub('{' + 'moon_id' + '}', CGI.escape(moon_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -869,36 +985,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseMoonsMoonIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseMoonsMoonIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_moons_moon_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_moons_moon_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get planet information
     # Get information on a planet  --- Alternate route: `/legacy/universe/planets/{planet_id}/`  Alternate route: `/v1/universe/planets/{planet_id}/`  --- This route expires daily at 11:05
-    # @param planet_id planet_id integer
+    # @param planet_id [Integer] planet_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniversePlanetsPlanetIdOk]
     def get_universe_planets_planet_id(planet_id, opts = {})
@@ -908,9 +1031,9 @@ module ESI
 
     # Get planet information
     # Get information on a planet  --- Alternate route: &#x60;/legacy/universe/planets/{planet_id}/&#x60;  Alternate route: &#x60;/v1/universe/planets/{planet_id}/&#x60;  --- This route expires daily at 11:05
-    # @param planet_id planet_id integer
+    # @param planet_id [Integer] planet_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniversePlanetsPlanetIdOk, Integer, Hash)>] GetUniversePlanetsPlanetIdOk data, response status code and response headers
     def get_universe_planets_planet_id_with_http_info(planet_id, opts = {})
@@ -921,11 +1044,12 @@ module ESI
       if @api_client.config.client_side_validation && planet_id.nil?
         fail ArgumentError, "Missing the required parameter 'planet_id' when calling UniverseApi.get_universe_planets_planet_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/planets/{planet_id}/'.sub('{' + 'planet_id' + '}', planet_id.to_s)
+      local_var_path = '/universe/planets/{planet_id}/'.sub('{' + 'planet_id' + '}', CGI.escape(planet_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -934,38 +1058,45 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniversePlanetsPlanetIdOk'
 
-      return_type = opts[:return_type] || 'GetUniversePlanetsPlanetIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_planets_planet_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_planets_planet_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get character races
     # Get a list of character races  --- Alternate route: `/dev/universe/races/`  Alternate route: `/legacy/universe/races/`  Alternate route: `/v1/universe/races/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<GetUniverseRaces200Ok>]
     def get_universe_races(opts = {})
       data, _status_code, _headers = get_universe_races_with_http_info(opts)
@@ -975,23 +1106,26 @@ module ESI
     # Get character races
     # Get a list of character races  --- Alternate route: &#x60;/dev/universe/races/&#x60;  Alternate route: &#x60;/legacy/universe/races/&#x60;  Alternate route: &#x60;/v1/universe/races/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(Array<GetUniverseRaces200Ok>, Integer, Hash)>] Array<GetUniverseRaces200Ok> data, response status code and response headers
     def get_universe_races_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_races ...'
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/races/'
@@ -1004,7 +1138,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -1012,28 +1146,35 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<GetUniverseRaces200Ok>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseRaces200Ok>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_races",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_races\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get regions
     # Get a list of regions  --- Alternate route: `/legacy/universe/regions/`  Alternate route: `/v1/universe/regions/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
     def get_universe_regions(opts = {})
@@ -1044,15 +1185,16 @@ module ESI
     # Get regions
     # Get a list of regions  --- Alternate route: &#x60;/legacy/universe/regions/&#x60;  Alternate route: &#x60;/v1/universe/regions/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_regions_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_regions ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/regions/'
@@ -1064,39 +1206,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_regions",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_regions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get region information
     # Get information on a region  --- Alternate route: `/legacy/universe/regions/{region_id}/`  Alternate route: `/v1/universe/regions/{region_id}/`  --- This route expires daily at 11:05
-    # @param region_id region_id integer
+    # @param region_id [Integer] region_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseRegionsRegionIdOk]
     def get_universe_regions_region_id(region_id, opts = {})
       data, _status_code, _headers = get_universe_regions_region_id_with_http_info(region_id, opts)
@@ -1105,12 +1254,12 @@ module ESI
 
     # Get region information
     # Get information on a region  --- Alternate route: &#x60;/legacy/universe/regions/{region_id}/&#x60;  Alternate route: &#x60;/v1/universe/regions/{region_id}/&#x60;  --- This route expires daily at 11:05
-    # @param region_id region_id integer
+    # @param region_id [Integer] region_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseRegionsRegionIdOk, Integer, Hash)>] GetUniverseRegionsRegionIdOk data, response status code and response headers
     def get_universe_regions_region_id_with_http_info(region_id, opts = {})
       if @api_client.config.debugging
@@ -1120,17 +1269,20 @@ module ESI
       if @api_client.config.client_side_validation && region_id.nil?
         fail ArgumentError, "Missing the required parameter 'region_id' when calling UniverseApi.get_universe_regions_region_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/regions/{region_id}/'.sub('{' + 'region_id' + '}', region_id.to_s)
+      local_var_path = '/universe/regions/{region_id}/'.sub('{' + 'region_id' + '}', CGI.escape(region_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1140,7 +1292,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -1148,29 +1300,36 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'GetUniverseRegionsRegionIdOk' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseRegionsRegionIdOk'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_regions_region_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_regions_region_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get stargate information
     # Get information on a stargate  --- Alternate route: `/legacy/universe/stargates/{stargate_id}/`  Alternate route: `/v1/universe/stargates/{stargate_id}/`  --- This route expires daily at 11:05
-    # @param stargate_id stargate_id integer
+    # @param stargate_id [Integer] stargate_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseStargatesStargateIdOk]
     def get_universe_stargates_stargate_id(stargate_id, opts = {})
@@ -1180,9 +1339,9 @@ module ESI
 
     # Get stargate information
     # Get information on a stargate  --- Alternate route: &#x60;/legacy/universe/stargates/{stargate_id}/&#x60;  Alternate route: &#x60;/v1/universe/stargates/{stargate_id}/&#x60;  --- This route expires daily at 11:05
-    # @param stargate_id stargate_id integer
+    # @param stargate_id [Integer] stargate_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseStargatesStargateIdOk, Integer, Hash)>] GetUniverseStargatesStargateIdOk data, response status code and response headers
     def get_universe_stargates_stargate_id_with_http_info(stargate_id, opts = {})
@@ -1193,11 +1352,12 @@ module ESI
       if @api_client.config.client_side_validation && stargate_id.nil?
         fail ArgumentError, "Missing the required parameter 'stargate_id' when calling UniverseApi.get_universe_stargates_stargate_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/stargates/{stargate_id}/'.sub('{' + 'stargate_id' + '}', stargate_id.to_s)
+      local_var_path = '/universe/stargates/{stargate_id}/'.sub('{' + 'stargate_id' + '}', CGI.escape(stargate_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1206,36 +1366,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'GetUniverseStargatesStargateIdOk' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseStargatesStargateIdOk'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_stargates_stargate_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_stargates_stargate_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get star information
     # Get information on a star  --- Alternate route: `/legacy/universe/stars/{star_id}/`  Alternate route: `/v1/universe/stars/{star_id}/`  --- This route expires daily at 11:05
-    # @param star_id star_id integer
+    # @param star_id [Integer] star_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseStarsStarIdOk]
     def get_universe_stars_star_id(star_id, opts = {})
@@ -1245,9 +1412,9 @@ module ESI
 
     # Get star information
     # Get information on a star  --- Alternate route: &#x60;/legacy/universe/stars/{star_id}/&#x60;  Alternate route: &#x60;/v1/universe/stars/{star_id}/&#x60;  --- This route expires daily at 11:05
-    # @param star_id star_id integer
+    # @param star_id [Integer] star_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseStarsStarIdOk, Integer, Hash)>] GetUniverseStarsStarIdOk data, response status code and response headers
     def get_universe_stars_star_id_with_http_info(star_id, opts = {})
@@ -1258,11 +1425,12 @@ module ESI
       if @api_client.config.client_side_validation && star_id.nil?
         fail ArgumentError, "Missing the required parameter 'star_id' when calling UniverseApi.get_universe_stars_star_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/stars/{star_id}/'.sub('{' + 'star_id' + '}', star_id.to_s)
+      local_var_path = '/universe/stars/{star_id}/'.sub('{' + 'star_id' + '}', CGI.escape(star_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1271,36 +1439,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseStarsStarIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseStarsStarIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_stars_star_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_stars_star_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get station information
     # Get information on a station  --- Alternate route: `/dev/universe/stations/{station_id}/`  Alternate route: `/v2/universe/stations/{station_id}/`  --- This route expires daily at 11:05
-    # @param station_id station_id integer
+    # @param station_id [Integer] station_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [GetUniverseStationsStationIdOk]
     def get_universe_stations_station_id(station_id, opts = {})
@@ -1310,9 +1485,9 @@ module ESI
 
     # Get station information
     # Get information on a station  --- Alternate route: &#x60;/dev/universe/stations/{station_id}/&#x60;  Alternate route: &#x60;/v2/universe/stations/{station_id}/&#x60;  --- This route expires daily at 11:05
-    # @param station_id station_id integer
+    # @param station_id [Integer] station_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(GetUniverseStationsStationIdOk, Integer, Hash)>] GetUniverseStationsStationIdOk data, response status code and response headers
     def get_universe_stations_station_id_with_http_info(station_id, opts = {})
@@ -1323,11 +1498,12 @@ module ESI
       if @api_client.config.client_side_validation && station_id.nil?
         fail ArgumentError, "Missing the required parameter 'station_id' when calling UniverseApi.get_universe_stations_station_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/stations/{station_id}/'.sub('{' + 'station_id' + '}', station_id.to_s)
+      local_var_path = '/universe/stations/{station_id}/'.sub('{' + 'station_id' + '}', CGI.escape(station_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1336,35 +1512,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseStationsStationIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseStationsStationIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_stations_station_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_stations_station_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # List all public structures
     # List all public structures  --- Alternate route: `/dev/universe/structures/`  Alternate route: `/legacy/universe/structures/`  Alternate route: `/v1/universe/structures/`  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :filter Only list public structures that have this service online
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
@@ -1376,7 +1559,7 @@ module ESI
     # List all public structures
     # List all public structures  --- Alternate route: &#x60;/dev/universe/structures/&#x60;  Alternate route: &#x60;/legacy/universe/structures/&#x60;  Alternate route: &#x60;/v1/universe/structures/&#x60;  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :filter Only list public structures that have this service online
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
@@ -1384,11 +1567,13 @@ module ESI
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_structures ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'filter'] && !['market', 'manufacturing_basic'].include?(opts[:'filter'])
-        fail ArgumentError, 'invalid value for "filter", must be one of market, manufacturing_basic'
+      allowable_values = ["market", "manufacturing_basic"]
+      if @api_client.config.client_side_validation && opts[:'filter'] && !allowable_values.include?(opts[:'filter'])
+        fail ArgumentError, "invalid value for \"filter\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/structures/'
@@ -1401,36 +1586,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_structures",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_structures\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get structure information
-    # Returns information on requested structure if you are on the ACL. Otherwise, returns \"Forbidden\" for all inputs.  --- Alternate route: `/v2/universe/structures/{structure_id}/`  --- This route is cached for up to 3600 seconds
-    # @param structure_id An Eve structure ID
+    # Returns information on requested structure if you are on the ACL. Otherwise, returns \"Forbidden\" for all inputs.  --- Alternate route: `/legacy/universe/structures/{structure_id}/`  Alternate route: `/v1/universe/structures/{structure_id}/`  Alternate route: `/v2/universe/structures/{structure_id}/`  --- This route is cached for up to 3600 seconds
+    # @param structure_id [Integer] An Eve structure ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [String] :token Access token to use if unable to set a header
     # @return [GetUniverseStructuresStructureIdOk]
@@ -1440,10 +1632,10 @@ module ESI
     end
 
     # Get structure information
-    # Returns information on requested structure if you are on the ACL. Otherwise, returns \&quot;Forbidden\&quot; for all inputs.  --- Alternate route: &#x60;/v2/universe/structures/{structure_id}/&#x60;  --- This route is cached for up to 3600 seconds
-    # @param structure_id An Eve structure ID
+    # Returns information on requested structure if you are on the ACL. Otherwise, returns \&quot;Forbidden\&quot; for all inputs.  --- Alternate route: &#x60;/legacy/universe/structures/{structure_id}/&#x60;  Alternate route: &#x60;/v1/universe/structures/{structure_id}/&#x60;  Alternate route: &#x60;/v2/universe/structures/{structure_id}/&#x60;  --- This route is cached for up to 3600 seconds
+    # @param structure_id [Integer] An Eve structure ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [String] :token Access token to use if unable to set a header
     # @return [Array<(GetUniverseStructuresStructureIdOk, Integer, Hash)>] GetUniverseStructuresStructureIdOk data, response status code and response headers
@@ -1455,11 +1647,12 @@ module ESI
       if @api_client.config.client_side_validation && structure_id.nil?
         fail ArgumentError, "Missing the required parameter 'structure_id' when calling UniverseApi.get_universe_structures_structure_id"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/structures/{structure_id}/'.sub('{' + 'structure_id' + '}', structure_id.to_s)
+      local_var_path = '/universe/structures/{structure_id}/'.sub('{' + 'structure_id' + '}', CGI.escape(structure_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1469,35 +1662,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'GetUniverseStructuresStructureIdOk' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseStructuresStructureIdOk'
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_structures_structure_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_structures_structure_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get system jumps
     # Get the number of jumps in solar systems within the last hour ending at the timestamp of the Last-Modified header, excluding wormhole space. Only systems with jumps will be listed  --- Alternate route: `/legacy/universe/system_jumps/`  Alternate route: `/v1/universe/system_jumps/`  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<GetUniverseSystemJumps200Ok>]
     def get_universe_system_jumps(opts = {})
@@ -1508,15 +1708,16 @@ module ESI
     # Get system jumps
     # Get the number of jumps in solar systems within the last hour ending at the timestamp of the Last-Modified header, excluding wormhole space. Only systems with jumps will be listed  --- Alternate route: &#x60;/legacy/universe/system_jumps/&#x60;  Alternate route: &#x60;/v1/universe/system_jumps/&#x60;  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<GetUniverseSystemJumps200Ok>, Integer, Hash)>] Array<GetUniverseSystemJumps200Ok> data, response status code and response headers
     def get_universe_system_jumps_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_system_jumps ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/system_jumps/'
@@ -1528,35 +1729,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<GetUniverseSystemJumps200Ok>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseSystemJumps200Ok>'
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_system_jumps",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_system_jumps\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get system kills
     # Get the number of ship, pod and NPC kills per solar system within the last hour ending at the timestamp of the Last-Modified header, excluding wormhole space. Only systems with kills will be listed  --- Alternate route: `/v2/universe/system_kills/`  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<GetUniverseSystemKills200Ok>]
     def get_universe_system_kills(opts = {})
@@ -1567,15 +1775,16 @@ module ESI
     # Get system kills
     # Get the number of ship, pod and NPC kills per solar system within the last hour ending at the timestamp of the Last-Modified header, excluding wormhole space. Only systems with kills will be listed  --- Alternate route: &#x60;/v2/universe/system_kills/&#x60;  --- This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<GetUniverseSystemKills200Ok>, Integer, Hash)>] Array<GetUniverseSystemKills200Ok> data, response status code and response headers
     def get_universe_system_kills_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_system_kills ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/system_kills/'
@@ -1587,35 +1796,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetUniverseSystemKills200Ok>'
 
-      return_type = opts[:return_type] || 'Array<GetUniverseSystemKills200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_system_kills",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_system_kills\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get solar systems
     # Get a list of solar systems  --- Alternate route: `/dev/universe/systems/`  Alternate route: `/legacy/universe/systems/`  Alternate route: `/v1/universe/systems/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<Integer>]
     def get_universe_systems(opts = {})
@@ -1626,15 +1842,16 @@ module ESI
     # Get solar systems
     # Get a list of solar systems  --- Alternate route: &#x60;/dev/universe/systems/&#x60;  Alternate route: &#x60;/legacy/universe/systems/&#x60;  Alternate route: &#x60;/v1/universe/systems/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_systems_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_systems ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/systems/'
@@ -1646,39 +1863,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_systems",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_systems\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get solar system information
     # Get information on a solar system.  --- Alternate route: `/dev/universe/systems/{system_id}/`  Alternate route: `/v4/universe/systems/{system_id}/`  --- This route expires daily at 11:05
-    # @param system_id system_id integer
+    # @param system_id [Integer] system_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseSystemsSystemIdOk]
     def get_universe_systems_system_id(system_id, opts = {})
       data, _status_code, _headers = get_universe_systems_system_id_with_http_info(system_id, opts)
@@ -1687,12 +1911,12 @@ module ESI
 
     # Get solar system information
     # Get information on a solar system.  --- Alternate route: &#x60;/dev/universe/systems/{system_id}/&#x60;  Alternate route: &#x60;/v4/universe/systems/{system_id}/&#x60;  --- This route expires daily at 11:05
-    # @param system_id system_id integer
+    # @param system_id [Integer] system_id integer
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseSystemsSystemIdOk, Integer, Hash)>] GetUniverseSystemsSystemIdOk data, response status code and response headers
     def get_universe_systems_system_id_with_http_info(system_id, opts = {})
       if @api_client.config.debugging
@@ -1702,17 +1926,20 @@ module ESI
       if @api_client.config.client_side_validation && system_id.nil?
         fail ArgumentError, "Missing the required parameter 'system_id' when calling UniverseApi.get_universe_systems_system_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/systems/{system_id}/'.sub('{' + 'system_id' + '}', system_id.to_s)
+      local_var_path = '/universe/systems/{system_id}/'.sub('{' + 'system_id' + '}', CGI.escape(system_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1722,7 +1949,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -1730,28 +1957,35 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseSystemsSystemIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseSystemsSystemIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_systems_system_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_systems_system_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get types
     # Get a list of type ids  --- Alternate route: `/legacy/universe/types/`  Alternate route: `/v1/universe/types/`  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return (default to 1)
     # @return [Array<Integer>]
@@ -1763,17 +1997,22 @@ module ESI
     # Get types
     # Get a list of type ids  --- Alternate route: &#x60;/legacy/universe/types/&#x60;  Alternate route: &#x60;/v1/universe/types/&#x60;  --- This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [Integer] :page Which page of results to return
+    # @option opts [Integer] :page Which page of results to return (default to 1)
     # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_types_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_types ...'
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling UniverseApi.get_universe_types, must be greater than or equal to 1.'
+      end
+
       # resource path
       local_var_path = '/universe/types/'
 
@@ -1785,39 +2024,46 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Integer>'
 
-      return_type = opts[:return_type] || 'Array<Integer>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_types",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_types\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get type information
-    # Get information on a type  --- Alternate route: `/dev/universe/types/{type_id}/`  Alternate route: `/v3/universe/types/{type_id}/`  --- This route expires daily at 11:05
-    # @param type_id An Eve item type ID
+    # Get information on a type  --- Alternate route: `/dev/universe/types/{type_id}/`  Alternate route: `/legacy/universe/types/{type_id}/`  Alternate route: `/v2/universe/types/{type_id}/`  Alternate route: `/v3/universe/types/{type_id}/`  --- This route expires daily at 11:05
+    # @param type_id [Integer] An Eve item type ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [GetUniverseTypesTypeIdOk]
     def get_universe_types_type_id(type_id, opts = {})
       data, _status_code, _headers = get_universe_types_type_id_with_http_info(type_id, opts)
@@ -1825,13 +2071,13 @@ module ESI
     end
 
     # Get type information
-    # Get information on a type  --- Alternate route: &#x60;/dev/universe/types/{type_id}/&#x60;  Alternate route: &#x60;/v3/universe/types/{type_id}/&#x60;  --- This route expires daily at 11:05
-    # @param type_id An Eve item type ID
+    # Get information on a type  --- Alternate route: &#x60;/dev/universe/types/{type_id}/&#x60;  Alternate route: &#x60;/legacy/universe/types/{type_id}/&#x60;  Alternate route: &#x60;/v2/universe/types/{type_id}/&#x60;  Alternate route: &#x60;/v3/universe/types/{type_id}/&#x60;  --- This route expires daily at 11:05
+    # @param type_id [Integer] An Eve item type ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(GetUniverseTypesTypeIdOk, Integer, Hash)>] GetUniverseTypesTypeIdOk data, response status code and response headers
     def get_universe_types_type_id_with_http_info(type_id, opts = {})
       if @api_client.config.debugging
@@ -1841,17 +2087,20 @@ module ESI
       if @api_client.config.client_side_validation && type_id.nil?
         fail ArgumentError, "Missing the required parameter 'type_id' when calling UniverseApi.get_universe_types_type_id"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/universe/types/{type_id}/'.sub('{' + 'type_id' + '}', type_id.to_s)
+      local_var_path = '/universe/types/{type_id}/'.sub('{' + 'type_id' + '}', CGI.escape(type_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -1861,7 +2110,7 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
@@ -1869,61 +2118,79 @@ module ESI
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetUniverseTypesTypeIdOk'
 
-      return_type = opts[:return_type] || 'GetUniverseTypesTypeIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.get_universe_types_type_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#get_universe_types_type_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Bulk names to IDs
     # Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours  --- Alternate route: `/dev/universe/ids/`  Alternate route: `/legacy/universe/ids/`  Alternate route: `/v1/universe/ids/` 
-    # @param body The names to resolve
+    # @param names [Array<String>] The names to resolve
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en)
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [PostUniverseIdsOk]
-    def post_universe_ids(body, opts = {})
-      data, _status_code, _headers = post_universe_ids_with_http_info(body, opts)
+    def post_universe_ids(names, opts = {})
+      data, _status_code, _headers = post_universe_ids_with_http_info(names, opts)
       data
     end
 
     # Bulk names to IDs
     # Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours  --- Alternate route: &#x60;/dev/universe/ids/&#x60;  Alternate route: &#x60;/legacy/universe/ids/&#x60;  Alternate route: &#x60;/v1/universe/ids/&#x60; 
-    # @param body The names to resolve
+    # @param names [Array<String>] The names to resolve
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response
-    # @option opts [String] :datasource The server name you would like data from
-    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language
+    # @option opts [String] :accept_language Language to use in the response (default to 'en')
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to 'en')
     # @return [Array<(PostUniverseIdsOk, Integer, Hash)>] PostUniverseIdsOk data, response status code and response headers
-    def post_universe_ids_with_http_info(body, opts = {})
+    def post_universe_ids_with_http_info(names, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.post_universe_ids ...'
       end
-      # verify the required parameter 'body' is set
-      if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling UniverseApi.post_universe_ids"
+      # verify the required parameter 'names' is set
+      if @api_client.config.client_side_validation && names.nil?
+        fail ArgumentError, "Missing the required parameter 'names' when calling UniverseApi.post_universe_ids"
+      end
+      if @api_client.config.client_side_validation && names.length > 500
+        fail ArgumentError, 'invalid value for "names" when calling UniverseApi.post_universe_ids, number of items must be less than or equal to 500.'
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+
+      if @api_client.config.client_side_validation && names.length < 1
+        fail ArgumentError, 'invalid value for "names" when calling UniverseApi.post_universe_ids, number of items must be greater than or equal to 1.'
+      end
+
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'accept_language'] && !allowable_values.include?(opts[:'accept_language'])
+        fail ArgumentError, "invalid value for \"accept_language\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['en', 'en-us', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of en, en-us, de, fr, ja, ru, zh, ko, es'
+      allowable_values = ["en", "en-us", "de", "fr", "ja", "ru", "zh", "ko", "es"]
+      if @api_client.config.client_side_validation && opts[:'language'] && !allowable_values.include?(opts[:'language'])
+        fail ArgumentError, "invalid value for \"language\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/ids/'
@@ -1936,60 +2203,79 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(names)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PostUniverseIdsOk'
 
-      return_type = opts[:return_type] || 'PostUniverseIdsOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.post_universe_ids",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#post_universe_ids\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
+
     # Get names and categories for a set of IDs
-    # Resolve a set of IDs to names and categories. Supported ID's for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types, Factions  --- Alternate route: `/dev/universe/names/`  Alternate route: `/v3/universe/names/` 
-    # @param body The ids to resolve
+    # Resolve a set of IDs to names and categories. Supported ID's for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types, Factions  --- Alternate route: `/dev/universe/names/`  Alternate route: `/legacy/universe/names/`  Alternate route: `/v2/universe/names/`  Alternate route: `/v3/universe/names/` 
+    # @param ids [Array<Integer>] The ids to resolve
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @return [Array<PostUniverseNames200Ok>]
-    def post_universe_names(body, opts = {})
-      data, _status_code, _headers = post_universe_names_with_http_info(body, opts)
+    def post_universe_names(ids, opts = {})
+      data, _status_code, _headers = post_universe_names_with_http_info(ids, opts)
       data
     end
 
     # Get names and categories for a set of IDs
-    # Resolve a set of IDs to names and categories. Supported ID&#x27;s for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types, Factions  --- Alternate route: &#x60;/dev/universe/names/&#x60;  Alternate route: &#x60;/v3/universe/names/&#x60; 
-    # @param body The ids to resolve
+    # Resolve a set of IDs to names and categories. Supported ID&#39;s for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types, Factions  --- Alternate route: &#x60;/dev/universe/names/&#x60;  Alternate route: &#x60;/legacy/universe/names/&#x60;  Alternate route: &#x60;/v2/universe/names/&#x60;  Alternate route: &#x60;/v3/universe/names/&#x60; 
+    # @param ids [Array<Integer>] The ids to resolve
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @return [Array<(Array<PostUniverseNames200Ok>, Integer, Hash)>] Array<PostUniverseNames200Ok> data, response status code and response headers
-    def post_universe_names_with_http_info(body, opts = {})
+    def post_universe_names_with_http_info(ids, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.post_universe_names ...'
       end
-      # verify the required parameter 'body' is set
-      if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling UniverseApi.post_universe_names"
+      # verify the required parameter 'ids' is set
+      if @api_client.config.client_side_validation && ids.nil?
+        fail ArgumentError, "Missing the required parameter 'ids' when calling UniverseApi.post_universe_names"
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      if @api_client.config.client_side_validation && ids.length > 1000
+        fail ArgumentError, 'invalid value for "ids" when calling UniverseApi.post_universe_names, number of items must be less than or equal to 1000.'
+      end
+
+      if @api_client.config.client_side_validation && ids.length < 1
+        fail ArgumentError, 'invalid value for "ids" when calling UniverseApi.post_universe_names, number of items must be greater than or equal to 1.'
+      end
+
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
       local_var_path = '/universe/names/'
@@ -2001,27 +2287,36 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(ids)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<PostUniverseNames200Ok>'
 
-      return_type = opts[:return_type] || 'Array<PostUniverseNames200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
 
-      auth_names = opts[:auth_names] || []
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      new_options = opts.merge(
+        :operation => :"UniverseApi.post_universe_names",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: UniverseApi#post_universe_names\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end