ruby-esi 0.3.0 → 0.5.0

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

@@ -3,15 +3,12 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
-require 'uri'
-
 module ESI
   class UniverseApi
     attr_accessor :api_client
@@ -20,12 +17,12 @@ module ESI
       @api_client = api_client
     end
     # Get ancestries
-    # Get all character ancestries  --- Alternate route: `/dev/universe/ancestries/`  Alternate route: `/legacy/universe/ancestries/`  Alternate route: `/v1/universe/ancestries/`  --- This route expires daily at 11:05
+    # 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-us)
+    # @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-us)
+    # @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)
@@ -33,63 +30,65 @@ module ESI
     end
 
     # Get ancestries
-    # Get all character ancestries  --- Alternate route: &#x60;/dev/universe/ancestries/&#x60;  Alternate route: &#x60;/legacy/universe/ancestries/&#x60;  Alternate route: &#x60;/v1/universe/ancestries/&#x60;  --- This route expires daily at 11:05
+    # 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] :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
-    # @return [Array<(Array<GetUniverseAncestries200Ok>, Fixnum, Hash)>] Array<GetUniverseAncestries200Ok> data, response status code and response headers
+    # @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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/ancestries/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseAncestries200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseAncestries200Ok>')
+        :return_type => return_type)
+
       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: `/dev/universe/asteroid_belts/{asteroid_belt_id}/`  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -101,12 +100,12 @@ module ESI
     end
 
     # Get asteroid belt information
-    # Get information on an asteroid belt  --- Alternate route: &#x60;/dev/universe/asteroid_belts/{asteroid_belt_id}/&#x60;  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseAsteroidBeltsAsteroidBeltIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_asteroid_belts_asteroid_belt_id ...'
@@ -122,42 +121,44 @@ module ESI
       local_var_path = '/universe/asteroid_belts/{asteroid_belt_id}/'.sub('{' + 'asteroid_belt_id' + '}', asteroid_belt_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseAsteroidBeltsAsteroidBeltIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseAsteroidBeltsAsteroidBeltIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/bloodlines/`  Alternate route: `/legacy/universe/bloodlines/`  Alternate route: `/v1/universe/bloodlines/`  --- This route expires daily at 11:05
+    # 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-us)
+    # @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-us)
+    # @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)
@@ -165,63 +166,65 @@ module ESI
     end
 
     # Get bloodlines
-    # Get a list of bloodlines  --- Alternate route: &#x60;/dev/universe/bloodlines/&#x60;  Alternate route: &#x60;/legacy/universe/bloodlines/&#x60;  Alternate route: &#x60;/v1/universe/bloodlines/&#x60;  --- This route expires daily at 11:05
+    # 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] :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
-    # @return [Array<(Array<GetUniverseBloodlines200Ok>, Fixnum, Hash)>] Array<GetUniverseBloodlines200Ok> data, response status code and response headers
+    # @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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/bloodlines/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseBloodlines200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseBloodlines200Ok>')
+        :return_type => return_type)
+
       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: `/dev/universe/categories/`  Alternate route: `/legacy/universe/categories/`  Alternate route: `/v1/universe/categories/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -232,11 +235,11 @@ module ESI
     end
 
     # Get item categories
-    # Get a list of item categories  --- Alternate route: &#x60;/dev/universe/categories/&#x60;  Alternate route: &#x60;/legacy/universe/categories/&#x60;  Alternate route: &#x60;/v1/universe/categories/&#x60;  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -248,43 +251,45 @@ module ESI
       local_var_path = '/universe/categories/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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: `/dev/universe/categories/{category_id}/`  Alternate route: `/legacy/universe/categories/{category_id}/`  Alternate route: `/v1/universe/categories/{category_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -292,14 +297,14 @@ module ESI
     end
 
     # Get item category information
-    # Get information of an item category  --- Alternate route: &#x60;/dev/universe/categories/{category_id}/&#x60;  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
+    # 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 [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] :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
-    # @return [Array<(GetUniverseCategoriesCategoryIdOk, Fixnum, Hash)>] GetUniverseCategoriesCategoryIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_categories_category_id ...'
@@ -308,52 +313,54 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/categories/{category_id}/'.sub('{' + 'category_id' + '}', category_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseCategoriesCategoryIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseCategoriesCategoryIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/constellations/`  Alternate route: `/legacy/universe/constellations/`  Alternate route: `/v1/universe/constellations/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -364,11 +371,11 @@ module ESI
     end
 
     # Get constellations
-    # Get a list of constellations  --- Alternate route: &#x60;/dev/universe/constellations/&#x60;  Alternate route: &#x60;/legacy/universe/constellations/&#x60;  Alternate route: &#x60;/v1/universe/constellations/&#x60;  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -380,43 +387,45 @@ module ESI
       local_var_path = '/universe/constellations/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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: `/dev/universe/constellations/{constellation_id}/`  Alternate route: `/legacy/universe/constellations/{constellation_id}/`  Alternate route: `/v1/universe/constellations/{constellation_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -424,14 +433,14 @@ module ESI
     end
 
     # Get constellation information
-    # Get information on a constellation  --- Alternate route: &#x60;/dev/universe/constellations/{constellation_id}/&#x60;  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
+    # 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 [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] :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
-    # @return [Array<(GetUniverseConstellationsConstellationIdOk, Fixnum, Hash)>] GetUniverseConstellationsConstellationIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_constellations_constellation_id ...'
@@ -440,45 +449,47 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/constellations/{constellation_id}/'.sub('{' + 'constellation_id' + '}', constellation_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseConstellationsConstellationIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseConstellationsConstellationIdOk')
+        :return_type => return_type)
+
       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
@@ -487,10 +498,10 @@ module ESI
     # 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-us)
+    # @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-us)
+    # @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)
@@ -504,57 +515,59 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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
-    # @return [Array<(Array<GetUniverseFactions200Ok>, Fixnum, Hash)>] Array<GetUniverseFactions200Ok> data, response status code and response headers
+    # @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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/factions/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseFactions200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseFactions200Ok>')
+        :return_type => return_type)
+
       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: `/dev/universe/graphics/`  Alternate route: `/legacy/universe/graphics/`  Alternate route: `/v1/universe/graphics/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -565,11 +578,11 @@ module ESI
     end
 
     # Get graphics
-    # Get a list of graphics  --- Alternate route: &#x60;/dev/universe/graphics/&#x60;  Alternate route: &#x60;/legacy/universe/graphics/&#x60;  Alternate route: &#x60;/v1/universe/graphics/&#x60;  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -581,30 +594,32 @@ module ESI
       local_var_path = '/universe/graphics/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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
@@ -628,7 +643,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseGraphicsGraphicIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_graphics_graphic_id ...'
@@ -644,37 +659,39 @@ module ESI
       local_var_path = '/universe/graphics/{graphic_id}/'.sub('{' + 'graphic_id' + '}', graphic_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseGraphicsGraphicIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseGraphicsGraphicIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/groups/`  Alternate route: `/legacy/universe/groups/`  Alternate route: `/v1/universe/groups/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -686,12 +703,12 @@ module ESI
     end
 
     # Get item groups
-    # Get a list of item groups  --- Alternate route: &#x60;/dev/universe/groups/&#x60;  Alternate route: &#x60;/legacy/universe/groups/&#x60;  Alternate route: &#x60;/v1/universe/groups/&#x60;  --- This route expires daily at 11:05
+    # 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] :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
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -699,39 +716,37 @@ module ESI
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       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/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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
@@ -741,10 +756,10 @@ module ESI
     # 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 [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -759,7 +774,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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
-    # @return [Array<(GetUniverseGroupsGroupIdOk, Fixnum, Hash)>] GetUniverseGroupsGroupIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_groups_group_id ...'
@@ -768,52 +783,54 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/groups/{group_id}/'.sub('{' + 'group_id' + '}', group_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseGroupsGroupIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseGroupsGroupIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/moons/{moon_id}/`  Alternate route: `/legacy/universe/moons/{moon_id}/`  Alternate route: `/v1/universe/moons/{moon_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -825,12 +842,12 @@ module ESI
     end
 
     # Get moon information
-    # Get information on a moon  --- Alternate route: &#x60;/dev/universe/moons/{moon_id}/&#x60;  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseMoonsMoonIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_moons_moon_id ...'
@@ -846,37 +863,39 @@ module ESI
       local_var_path = '/universe/moons/{moon_id}/'.sub('{' + 'moon_id' + '}', moon_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseMoonsMoonIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseMoonsMoonIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/planets/{planet_id}/`  Alternate route: `/legacy/universe/planets/{planet_id}/`  Alternate route: `/v1/universe/planets/{planet_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -888,12 +907,12 @@ module ESI
     end
 
     # Get planet information
-    # Get information on a planet  --- Alternate route: &#x60;/dev/universe/planets/{planet_id}/&#x60;  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniversePlanetsPlanetIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_planets_planet_id ...'
@@ -909,30 +928,32 @@ module ESI
       local_var_path = '/universe/planets/{planet_id}/'.sub('{' + 'planet_id' + '}', planet_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniversePlanetsPlanetIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniversePlanetsPlanetIdOk')
+        :return_type => return_type)
+
       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
@@ -941,10 +962,10 @@ module ESI
     # 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-us)
+    # @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-us)
+    # @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)
@@ -958,57 +979,59 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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
-    # @return [Array<(Array<GetUniverseRaces200Ok>, Fixnum, Hash)>] Array<GetUniverseRaces200Ok> data, response status code and response headers
+    # @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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/races/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseRaces200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseRaces200Ok>')
+        :return_type => return_type)
+
       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: `/dev/universe/regions/`  Alternate route: `/legacy/universe/regions/`  Alternate route: `/v1/universe/regions/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -1019,11 +1042,11 @@ module ESI
     end
 
     # Get regions
-    # Get a list of regions  --- Alternate route: &#x60;/dev/universe/regions/&#x60;  Alternate route: &#x60;/legacy/universe/regions/&#x60;  Alternate route: &#x60;/v1/universe/regions/&#x60;  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -1035,43 +1058,45 @@ module ESI
       local_var_path = '/universe/regions/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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: `/dev/universe/regions/{region_id}/`  Alternate route: `/legacy/universe/regions/{region_id}/`  Alternate route: `/v1/universe/regions/{region_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -1079,14 +1104,14 @@ module ESI
     end
 
     # Get region information
-    # Get information on a region  --- Alternate route: &#x60;/dev/universe/regions/{region_id}/&#x60;  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
+    # 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 [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] :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
-    # @return [Array<(GetUniverseRegionsRegionIdOk, Fixnum, Hash)>] GetUniverseRegionsRegionIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_regions_region_id ...'
@@ -1095,52 +1120,54 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/regions/{region_id}/'.sub('{' + 'region_id' + '}', region_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseRegionsRegionIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseRegionsRegionIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/stargates/{stargate_id}/`  Alternate route: `/legacy/universe/stargates/{stargate_id}/`  Alternate route: `/v1/universe/stargates/{stargate_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -1152,12 +1179,12 @@ module ESI
     end
 
     # Get stargate information
-    # Get information on a stargate  --- Alternate route: &#x60;/dev/universe/stargates/{stargate_id}/&#x60;  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseStargatesStargateIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_stargates_stargate_id ...'
@@ -1173,37 +1200,39 @@ module ESI
       local_var_path = '/universe/stargates/{stargate_id}/'.sub('{' + 'stargate_id' + '}', stargate_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseStargatesStargateIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseStargatesStargateIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/stars/{star_id}/`  Alternate route: `/legacy/universe/stars/{star_id}/`  Alternate route: `/v1/universe/stars/{star_id}/`  --- This route expires daily at 11:05
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -1215,12 +1244,12 @@ module ESI
     end
 
     # Get star information
-    # Get information on a star  --- Alternate route: &#x60;/dev/universe/stars/{star_id}/&#x60;  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
+    # 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 [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseStarsStarIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_stars_star_id ...'
@@ -1236,30 +1265,32 @@ module ESI
       local_var_path = '/universe/stars/{star_id}/'.sub('{' + 'star_id' + '}', star_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseStarsStarIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseStarsStarIdOk')
+        :return_type => return_type)
+
       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
@@ -1283,7 +1314,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseStationsStationIdOk data, response status code and response headers
+    # @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 = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_stations_station_id ...'
@@ -1299,30 +1330,32 @@ module ESI
       local_var_path = '/universe/stations/{station_id}/'.sub('{' + 'station_id' + '}', station_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseStationsStationIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseStationsStationIdOk')
+        :return_type => return_type)
+
       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
@@ -1346,7 +1379,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_universe_structures_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_structures ...'
@@ -1361,38 +1394,40 @@ module ESI
       local_var_path = '/universe/structures/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'filter'] = opts[:'filter'] if !opts[:'filter'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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: `/dev/universe/structures/{structure_id}/`  Alternate route: `/v2/universe/structures/{structure_id}/`  --- This route is cached for up to 3600 seconds
+    # 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
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
@@ -1405,13 +1440,13 @@ 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;/dev/universe/structures/{structure_id}/&#x60;  Alternate route: &#x60;/v2/universe/structures/{structure_id}/&#x60;  --- This route is cached for up to 3600 seconds
+    # 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
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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, Fixnum, Hash)>] GetUniverseStructuresStructureIdOk data, response status code and response headers
+    # @return [Array<(GetUniverseStructuresStructureIdOk, Integer, Hash)>] GetUniverseStructuresStructureIdOk data, response status code and response headers
     def get_universe_structures_structure_id_with_http_info(structure_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_structures_structure_id ...'
@@ -1427,38 +1462,40 @@ module ESI
       local_var_path = '/universe/structures/{structure_id}/'.sub('{' + 'structure_id' + '}', structure_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseStructuresStructureIdOk' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseStructuresStructureIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/system_jumps/`  Alternate route: `/legacy/universe/system_jumps/`  Alternate route: `/v1/universe/system_jumps/`  --- This route is cached for up to 3600 seconds
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -1469,11 +1506,11 @@ module ESI
     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: &#x60;/dev/universe/system_jumps/&#x60;  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
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<GetUniverseSystemJumps200Ok>, Fixnum, Hash)>] Array<GetUniverseSystemJumps200Ok> data, response status code and response headers
+    # @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 ...'
@@ -1485,37 +1522,39 @@ module ESI
       local_var_path = '/universe/system_jumps/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseSystemJumps200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseSystemJumps200Ok>')
+        :return_type => return_type)
+
       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: `/dev/universe/system_kills/`  Alternate route: `/v2/universe/system_kills/`  --- This route is cached for up to 3600 seconds
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -1526,11 +1565,11 @@ module ESI
     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: &#x60;/dev/universe/system_kills/&#x60;  Alternate route: &#x60;/v2/universe/system_kills/&#x60;  --- This route is cached for up to 3600 seconds
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(Array<GetUniverseSystemKills200Ok>, Fixnum, Hash)>] Array<GetUniverseSystemKills200Ok> data, response status code and response headers
+    # @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 ...'
@@ -1542,30 +1581,32 @@ module ESI
       local_var_path = '/universe/system_kills/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetUniverseSystemKills200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetUniverseSystemKills200Ok>')
+        :return_type => return_type)
+
       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
@@ -1587,7 +1628,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @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>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -1599,30 +1640,32 @@ module ESI
       local_var_path = '/universe/systems/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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
@@ -1632,10 +1675,10 @@ module ESI
     # 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 [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -1650,7 +1693,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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
-    # @return [Array<(GetUniverseSystemsSystemIdOk, Fixnum, Hash)>] GetUniverseSystemsSystemIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_systems_system_id ...'
@@ -1659,52 +1702,54 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/systems/{system_id}/'.sub('{' + 'system_id' + '}', system_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseSystemsSystemIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseSystemsSystemIdOk')
+        :return_type => return_type)
+
       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: `/dev/universe/types/`  Alternate route: `/legacy/universe/types/`  Alternate route: `/v1/universe/types/`  --- This route expires daily at 11:05
+    # 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
@@ -1716,12 +1761,12 @@ module ESI
     end
 
     # Get types
-    # Get a list of type ids  --- Alternate route: &#x60;/dev/universe/types/&#x60;  Alternate route: &#x60;/legacy/universe/types/&#x60;  Alternate route: &#x60;/v1/universe/types/&#x60;  --- This route expires daily at 11:05
+    # 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] :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
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @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 ...'
@@ -1729,39 +1774,37 @@ module ESI
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       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/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       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
@@ -1771,10 +1814,10 @@ module ESI
     # 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
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @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)
@@ -1789,7 +1832,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @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
-    # @return [Array<(GetUniverseTypesTypeIdOk, Fixnum, Hash)>] GetUniverseTypesTypeIdOk data, response status code and response headers
+    # @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
         @api_client.config.logger.debug 'Calling API: UniverseApi.get_universe_types_type_id ...'
@@ -1798,45 +1841,47 @@ 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'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/types/{type_id}/'.sub('{' + 'type_id' + '}', type_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       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?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetUniverseTypesTypeIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetUniverseTypesTypeIdOk')
+        :return_type => return_type)
+
       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
@@ -1844,52 +1889,52 @@ module ESI
     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 names The names to resolve
+    # @param body The names to resolve
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :accept_language Language to use in the response (default to en-us)
+    # @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-us)
+    # @option opts [String] :language Language to use in the response, takes precedence over Accept-Language (default to en)
     # @return [PostUniverseIdsOk]
-    def post_universe_ids(names, opts = {})
-      data, _status_code, _headers = post_universe_ids_with_http_info(names, opts)
+    def post_universe_ids(body, opts = {})
+      data, _status_code, _headers = post_universe_ids_with_http_info(body, 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 names The names to resolve
+    # @param body 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
-    # @return [Array<(PostUniverseIdsOk, Fixnum, Hash)>] PostUniverseIdsOk data, response status code and response headers
-    def post_universe_ids_with_http_info(names, opts = {})
+    # @return [Array<(PostUniverseIdsOk, Integer, Hash)>] PostUniverseIdsOk data, response status code and response headers
+    def post_universe_ids_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.post_universe_ids ...'
       end
-      # 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"
+      # 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"
       end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       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'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh, ko'
+      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'
       end
       # resource path
       local_var_path = '/universe/ids/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
@@ -1897,18 +1942,22 @@ module ESI
       header_params[:'Accept-Language'] = opts[:'accept_language'] if !opts[:'accept_language'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(names)
-      auth_names = []
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+
+      return_type = opts[:return_type] || 'PostUniverseIdsOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'PostUniverseIdsOk')
+        :return_type => return_type)
+
       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
@@ -1916,28 +1965,28 @@ module ESI
     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 ids The ids to resolve
+    # @param body 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)
     # @return [Array<PostUniverseNames200Ok>]
-    def post_universe_names(ids, opts = {})
-      data, _status_code, _headers = post_universe_names_with_http_info(ids, opts)
+    def post_universe_names(body, opts = {})
+      data, _status_code, _headers = post_universe_names_with_http_info(body, opts)
       data
     end
 
     # Get names and categories for a set of IDs
-    # 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;/v3/universe/names/&#x60; 
-    # @param ids The ids to resolve
+    # 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
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @return [Array<(Array<PostUniverseNames200Ok>, Fixnum, Hash)>] Array<PostUniverseNames200Ok> data, response status code and response headers
-    def post_universe_names_with_http_info(ids, opts = {})
+    # @return [Array<(Array<PostUniverseNames200Ok>, Integer, Hash)>] Array<PostUniverseNames200Ok> data, response status code and response headers
+    def post_universe_names_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UniverseApi.post_universe_names ...'
       end
-      # 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"
+      # 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"
       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'
@@ -1946,29 +1995,33 @@ module ESI
       local_var_path = '/universe/names/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(ids)
-      auth_names = []
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+
+      return_type = opts[:return_type] || 'Array<PostUniverseNames200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<PostUniverseNames200Ok>')
+        :return_type => return_type)
+
       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