esi_client 0.8.5.0 → 1.0.1

data/lib/esi_client/api/sovereignty_api.rb

@@ -3,14 +3,13 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require "uri"
 
 module ESIClient
   class SovereigntyApi
@@ -19,44 +18,46 @@ module ESIClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
+
     # List sovereignty campaigns
     # Shows sovereignty data for campaigns.  ---  This route is cached for up to 5 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetSovereigntyCampaigns200Ok>]
     def get_sovereignty_campaigns(opts = {})
       data, _status_code, _headers = get_sovereignty_campaigns_with_http_info(opts)
-      data
+      return data
     end
 
     # List sovereignty campaigns
     # Shows sovereignty data for campaigns.  ---  This route is cached for up to 5 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetSovereigntyCampaigns200Ok>, Fixnum, Hash)>] Array<GetSovereigntyCampaigns200Ok> data, response status code and response headers
     def get_sovereignty_campaigns_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: SovereigntyApi.get_sovereignty_campaigns ...'
+        @api_client.config.logger.debug "Calling API: SovereigntyApi.get_sovereignty_campaigns ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/sovereignty/campaigns/'
+      local_var_path = "/v1/sovereignty/campaigns/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -76,44 +77,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # List sovereignty of systems
     # Shows sovereignty information for solar systems  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetSovereigntyMap200Ok>]
     def get_sovereignty_map(opts = {})
       data, _status_code, _headers = get_sovereignty_map_with_http_info(opts)
-      data
+      return data
     end
 
     # List sovereignty of systems
     # Shows sovereignty information for solar systems  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetSovereigntyMap200Ok>, Fixnum, Hash)>] Array<GetSovereigntyMap200Ok> data, response status code and response headers
     def get_sovereignty_map_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: SovereigntyApi.get_sovereignty_map ...'
+        @api_client.config.logger.debug "Calling API: SovereigntyApi.get_sovereignty_map ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/sovereignty/map/'
+      local_var_path = "/v1/sovereignty/map/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -133,44 +136,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # List sovereignty structures
     # Shows sovereignty data for structures.  ---  This route is cached for up to 120 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetSovereigntyStructures200Ok>]
     def get_sovereignty_structures(opts = {})
       data, _status_code, _headers = get_sovereignty_structures_with_http_info(opts)
-      data
+      return data
     end
 
     # List sovereignty structures
     # Shows sovereignty data for structures.  ---  This route is cached for up to 120 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetSovereigntyStructures200Ok>, Fixnum, Hash)>] Array<GetSovereigntyStructures200Ok> data, response status code and response headers
     def get_sovereignty_structures_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: SovereigntyApi.get_sovereignty_structures ...'
+        @api_client.config.logger.debug "Calling API: SovereigntyApi.get_sovereignty_structures ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/sovereignty/structures/'
+      local_var_path = "/v1/sovereignty/structures/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}

data/lib/esi_client/api/status_api.rb

@@ -3,14 +3,13 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require "uri"
 
 module ESIClient
   class StatusApi
@@ -19,44 +18,46 @@ module ESIClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
+
     # Retrieve the uptime and player counts
     # EVE Server status  ---  This route is cached for up to 30 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetStatusOk]
     def get_status(opts = {})
       data, _status_code, _headers = get_status_with_http_info(opts)
-      data
+      return data
     end
 
     # Retrieve the uptime and player counts
     # EVE Server status  ---  This route is cached for up to 30 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetStatusOk, Fixnum, Hash)>] GetStatusOk data, response status code and response headers
     def get_status_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: StatusApi.get_status ...'
+        @api_client.config.logger.debug "Calling API: StatusApi.get_status ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/status/'
+      local_var_path = "/v1/status/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}

data/lib/esi_client/api/universe_api.rb

@@ -3,14 +3,13 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require "uri"
 
 module ESIClient
   class UniverseApi
@@ -19,188 +18,52 @@ module ESIClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Get ancestries
-    # Get all character 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] :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)
-    # @return [Array<GetUniverseAncestries200Ok>]
-    def get_universe_ancestries(opts = {})
-      data, _status_code, _headers = get_universe_ancestries_with_http_info(opts)
-      data
-    end
-
-    # Get ancestries
-    # Get all character 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
-    # @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
-    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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
-      end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      # resource path
-      local_var_path = '/v1/universe/ancestries/'
-
-      # query parameters
-      query_params = {}
-      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
-      query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
-
-      # header parameters
-      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 = {}
-
-      # http body (model)
-      post_body = nil
-      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>')
-      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  ---  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)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [GetUniverseAsteroidBeltsAsteroidBeltIdOk]
-    def get_universe_asteroid_belts_asteroid_belt_id(asteroid_belt_id, opts = {})
-      data, _status_code, _headers = get_universe_asteroid_belts_asteroid_belt_id_with_http_info(asteroid_belt_id, opts)
-      data
-    end
-
-    # Get asteroid belt information
-    # Get information on an asteroid belt  ---  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
-    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 ...'
-      end
-      # verify the required parameter 'asteroid_belt_id' is set
-      if @api_client.config.client_side_validation && asteroid_belt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'asteroid_belt_id' when calling UniverseApi.get_universe_asteroid_belts_asteroid_belt_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
-      end
-      # resource path
-      local_var_path = '/v1/universe/asteroid_belts/{asteroid_belt_id}/'.sub('{' + 'asteroid_belt_id' + '}', asteroid_belt_id.to_s)
-
-      # query parameters
-      query_params = {}
-      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
-      # header parameters
-      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 = {}
-
-      # http body (model)
-      post_body = nil
-      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')
-      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  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetUniverseBloodlines200Ok>]
     def get_universe_bloodlines(opts = {})
       data, _status_code, _headers = get_universe_bloodlines_with_http_info(opts)
-      data
+      return data
     end
 
     # Get bloodlines
     # Get a list of 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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetUniverseBloodlines200Ok>, Fixnum, 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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_bloodlines ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/bloodlines/'
+      local_var_path = "/v1/universe/bloodlines/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -220,44 +83,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get item categories
     # Get a list of item 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_categories(opts = {})
       data, _status_code, _headers = get_universe_categories_with_http_info(opts)
-      data
+      return data
     end
 
     # Get item categories
     # Get a list of item 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
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_categories ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/categories/'
+      local_var_path = "/v1/universe/categories/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -277,62 +142,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get item category information
     # Get information of an item category  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get item category information
     # Get information of an item category  ---  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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseCategoriesCategoryIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_categories_category_id ..."
       end
       # verify the required parameter 'category_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'category_id' when calling UniverseApi.get_universe_categories_category_id" if category_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/categories/{category_id}/'.sub('{' + 'category_id' + '}', category_id.to_s)
+      local_var_path = "/v1/universe/categories/{category_id}/".sub('{format}','json').sub('{' + 'category_id' + '}', category_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -352,44 +211,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get constellations
     # Get a list of 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_constellations(opts = {})
       data, _status_code, _headers = get_universe_constellations_with_http_info(opts)
-      data
+      return data
     end
 
     # Get constellations
     # Get a list of 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
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_constellations ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/constellations/'
+      local_var_path = "/v1/universe/constellations/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -409,62 +270,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get constellation information
     # Get information on a constellation  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get constellation information
     # Get information on a constellation  ---  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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseConstellationsConstellationIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_constellations_constellation_id ..."
       end
       # verify the required parameter 'constellation_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'constellation_id' when calling UniverseApi.get_universe_constellations_constellation_id" if constellation_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/constellations/{constellation_id}/'.sub('{' + 'constellation_id' + '}', constellation_id.to_s)
+      local_var_path = "/v1/universe/constellations/{constellation_id}/".sub('{format}','json').sub('{' + 'constellation_id' + '}', constellation_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -484,56 +339,52 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get factions
     # Get a list of 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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetUniverseFactions200Ok>]
     def get_universe_factions(opts = {})
       data, _status_code, _headers = get_universe_factions_with_http_info(opts)
-      data
+      return data
     end
 
     # Get factions
     # Get a list of 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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetUniverseFactions200Ok>, Fixnum, 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 ...'
+        @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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v2/universe/factions/'
+      local_var_path = "/v1/universe/factions/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -553,44 +404,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get graphics
     # Get a list of 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_graphics(opts = {})
       data, _status_code, _headers = get_universe_graphics_with_http_info(opts)
-      data
+      return data
     end
 
     # Get graphics
     # Get a list of 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
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_graphics ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/graphics/'
+      local_var_path = "/v1/universe/graphics/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -610,16 +463,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get graphic information
     # Get information on a graphic  ---  This route expires daily at 11:05
     # @param graphic_id graphic_id integer
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniverseGraphicsGraphicIdOk]
     def get_universe_graphics_graphic_id(graphic_id, opts = {})
       data, _status_code, _headers = get_universe_graphics_graphic_id_with_http_info(graphic_id, opts)
-      data
+      return data
     end
 
     # Get graphic information
@@ -627,33 +482,31 @@ module ESIClient
     # @param graphic_id graphic_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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseGraphicsGraphicIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_graphics_graphic_id ..."
       end
       # verify the required parameter 'graphic_id' is set
-      if @api_client.config.client_side_validation && graphic_id.nil?
-        fail ArgumentError, "Missing the required parameter 'graphic_id' when calling UniverseApi.get_universe_graphics_graphic_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'graphic_id' when calling UniverseApi.get_universe_graphics_graphic_id" if graphic_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/graphics/{graphic_id}/'.sub('{' + 'graphic_id' + '}', graphic_id.to_s)
+      local_var_path = "/v1/universe/graphics/{graphic_id}/".sub('{format}','json').sub('{' + 'graphic_id' + '}', graphic_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -673,51 +526,53 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get item groups
     # Get a list of item 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
-    # @option opts [Integer] :page Which page of results to return (default to 1)
+    # @option opts [Integer] :page Which page to query
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_groups(opts = {})
       data, _status_code, _headers = get_universe_groups_with_http_info(opts)
-      data
+      return data
     end
 
     # Get item groups
     # Get a list of item 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
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [Integer] :page Which page of results to return
+    # @option opts [Integer] :page Which page to query
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_groups ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+      if !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 = '/v1/universe/groups/'
+      local_var_path = "/v1/universe/groups/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -737,62 +592,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get item group information
     # Get information on an item group  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get item group information
     # Get information on an item group  ---  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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseGroupsGroupIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_groups_group_id ..."
       end
       # verify the required parameter 'group_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'group_id' when calling UniverseApi.get_universe_groups_group_id" if group_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/groups/{group_id}/'.sub('{' + 'group_id' + '}', group_id.to_s)
+      local_var_path = "/v1/universe/groups/{group_id}/".sub('{format}','json').sub('{' + 'group_id' + '}', group_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -812,16 +661,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get moon information
     # Get information on a moon  ---  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)
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniverseMoonsMoonIdOk]
     def get_universe_moons_moon_id(moon_id, opts = {})
       data, _status_code, _headers = get_universe_moons_moon_id_with_http_info(moon_id, opts)
-      data
+      return data
     end
 
     # Get moon information
@@ -829,33 +680,31 @@ module ESIClient
     # @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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseMoonsMoonIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_moons_moon_id ..."
       end
       # verify the required parameter 'moon_id' is set
-      if @api_client.config.client_side_validation && moon_id.nil?
-        fail ArgumentError, "Missing the required parameter 'moon_id' when calling UniverseApi.get_universe_moons_moon_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'moon_id' when calling UniverseApi.get_universe_moons_moon_id" if moon_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/moons/{moon_id}/'.sub('{' + 'moon_id' + '}', moon_id.to_s)
+      local_var_path = "/v1/universe/moons/{moon_id}/".sub('{format}','json').sub('{' + 'moon_id' + '}', moon_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -875,16 +724,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get planet information
     # Get information on a planet  ---  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)
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniversePlanetsPlanetIdOk]
     def get_universe_planets_planet_id(planet_id, opts = {})
       data, _status_code, _headers = get_universe_planets_planet_id_with_http_info(planet_id, opts)
-      data
+      return data
     end
 
     # Get planet information
@@ -892,33 +743,31 @@ module ESIClient
     # @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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniversePlanetsPlanetIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_planets_planet_id ..."
       end
       # verify the required parameter 'planet_id' is set
-      if @api_client.config.client_side_validation && planet_id.nil?
-        fail ArgumentError, "Missing the required parameter 'planet_id' when calling UniverseApi.get_universe_planets_planet_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'planet_id' when calling UniverseApi.get_universe_planets_planet_id" if planet_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/planets/{planet_id}/'.sub('{' + 'planet_id' + '}', planet_id.to_s)
+      local_var_path = "/v1/universe/planets/{planet_id}/".sub('{format}','json').sub('{' + 'planet_id' + '}', planet_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -938,56 +787,52 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get character races
     # Get a list of character 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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetUniverseRaces200Ok>]
     def get_universe_races(opts = {})
       data, _status_code, _headers = get_universe_races_with_http_info(opts)
-      data
+      return data
     end
 
     # Get character races
     # Get a list of character 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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetUniverseRaces200Ok>, Fixnum, 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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_races ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/races/'
+      local_var_path = "/v1/universe/races/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1007,44 +852,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get regions
     # Get a list of 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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_regions(opts = {})
       data, _status_code, _headers = get_universe_regions_with_http_info(opts)
-      data
+      return data
     end
 
     # Get regions
     # Get a list of 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
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_regions ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/regions/'
+      local_var_path = "/v1/universe/regions/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1064,62 +911,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get region information
     # Get information on a region  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get region information
     # Get information on a region  ---  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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseRegionsRegionIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_regions_region_id ..."
       end
       # verify the required parameter 'region_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'region_id' when calling UniverseApi.get_universe_regions_region_id" if region_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v1/universe/regions/{region_id}/'.sub('{' + 'region_id' + '}', region_id.to_s)
+      local_var_path = "/v1/universe/regions/{region_id}/".sub('{format}','json').sub('{' + 'region_id' + '}', region_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1139,16 +980,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get stargate information
     # Get information on a stargate  ---  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)
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniverseStargatesStargateIdOk]
     def get_universe_stargates_stargate_id(stargate_id, opts = {})
       data, _status_code, _headers = get_universe_stargates_stargate_id_with_http_info(stargate_id, opts)
-      data
+      return data
     end
 
     # Get stargate information
@@ -1156,33 +999,31 @@ module ESIClient
     # @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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseStargatesStargateIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_stargates_stargate_id ..."
       end
       # verify the required parameter 'stargate_id' is set
-      if @api_client.config.client_side_validation && stargate_id.nil?
-        fail ArgumentError, "Missing the required parameter 'stargate_id' when calling UniverseApi.get_universe_stargates_stargate_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'stargate_id' when calling UniverseApi.get_universe_stargates_stargate_id" if stargate_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/stargates/{stargate_id}/'.sub('{' + 'stargate_id' + '}', stargate_id.to_s)
+      local_var_path = "/v1/universe/stargates/{stargate_id}/".sub('{format}','json').sub('{' + 'stargate_id' + '}', stargate_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1202,113 +1043,50 @@ module ESIClient
       end
       return data, status_code, headers
     end
-    # Get star information
-    # Get information on a star  ---  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)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [GetUniverseStarsStarIdOk]
-    def get_universe_stars_star_id(star_id, opts = {})
-      data, _status_code, _headers = get_universe_stars_star_id_with_http_info(star_id, opts)
-      data
-    end
-
-    # Get star information
-    # Get information on a star  ---  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
-    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 ...'
-      end
-      # verify the required parameter 'star_id' is set
-      if @api_client.config.client_side_validation && star_id.nil?
-        fail ArgumentError, "Missing the required parameter 'star_id' when calling UniverseApi.get_universe_stars_star_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
-      end
-      # resource path
-      local_var_path = '/v1/universe/stars/{star_id}/'.sub('{' + 'star_id' + '}', star_id.to_s)
-
-      # query parameters
-      query_params = {}
-      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
-
-      # header parameters
-      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 = {}
 
-      # http body (model)
-      post_body = nil
-      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')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: UniverseApi#get_universe_stars_star_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
     # Get station information
-    # Get information on a station  ---  This route expires daily at 11:05
+    # Get information on a station  ---  This route is cached for up to 300 seconds
     # @param station_id station_id integer
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniverseStationsStationIdOk]
     def get_universe_stations_station_id(station_id, opts = {})
       data, _status_code, _headers = get_universe_stations_station_id_with_http_info(station_id, opts)
-      data
+      return data
     end
 
     # Get station information
-    # Get information on a station  ---  This route expires daily at 11:05
+    # Get information on a station  ---  This route is cached for up to 300 seconds
     # @param station_id station_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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseStationsStationIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_stations_station_id ..."
       end
       # verify the required parameter 'station_id' is set
-      if @api_client.config.client_side_validation && station_id.nil?
-        fail ArgumentError, "Missing the required parameter 'station_id' when calling UniverseApi.get_universe_stations_station_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'station_id' when calling UniverseApi.get_universe_stations_station_id" if station_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v2/universe/stations/{station_id}/'.sub('{' + 'station_id' + '}', station_id.to_s)
+      local_var_path = "/v2/universe/stations/{station_id}/".sub('{format}','json').sub('{' + 'station_id' + '}', station_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1328,44 +1106,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # List all public structures
     # List all public structures  ---  This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_structures(opts = {})
       data, _status_code, _headers = get_universe_structures_with_http_info(opts)
-      data
+      return data
     end
 
     # List all public structures
     # List all public structures  ---  This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_structures ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/structures/'
+      local_var_path = "/v1/universe/structures/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1385,53 +1165,53 @@ module ESIClient
       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.  ---  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.  ---  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)
-    # @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
+    # @option opts [String] :token Access token to use, if preferred over a header
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetUniverseStructuresStructureIdOk]
     def get_universe_structures_structure_id(structure_id, opts = {})
       data, _status_code, _headers = get_universe_structures_structure_id_with_http_info(structure_id, opts)
-      data
+      return data
     end
 
     # Get structure information
-    # Returns information on requested structure if you are on the ACL. Otherwise, returns \&quot;Forbidden\&quot; for all inputs.  ---  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.  ---  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
+    # @option opts [String] :token Access token to use, if preferred over a header
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseStructuresStructureIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_structures_structure_id ..."
       end
       # verify the required parameter 'structure_id' is set
-      if @api_client.config.client_side_validation && structure_id.nil?
-        fail ArgumentError, "Missing the required parameter 'structure_id' when calling UniverseApi.get_universe_structures_structure_id"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'structure_id' when calling UniverseApi.get_universe_structures_structure_id" if structure_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v2/universe/structures/{structure_id}/'.sub('{' + 'structure_id' + '}', structure_id.to_s)
+      local_var_path = "/v1/universe/structures/{structure_id}/".sub('{format}','json').sub('{' + 'structure_id' + '}', structure_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1451,44 +1231,46 @@ module ESIClient
       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  ---  This route is cached for up to 3600 seconds
+    # Get the number of jumps in solar systems within the last hour, excluding wormhole space. Only systems with jumps will be listed  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetUniverseSystemJumps200Ok>]
     def get_universe_system_jumps(opts = {})
       data, _status_code, _headers = get_universe_system_jumps_with_http_info(opts)
-      data
+      return data
     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  ---  This route is cached for up to 3600 seconds
+    # Get the number of jumps in solar systems within the last hour, excluding wormhole space. Only systems with jumps will be listed  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetUniverseSystemJumps200Ok>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_system_jumps ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/system_jumps/'
+      local_var_path = "/v1/universe/system_jumps/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1508,44 +1290,46 @@ module ESIClient
       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  ---  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, excluding wormhole space. Only systems with kills will be listed  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetUniverseSystemKills200Ok>]
     def get_universe_system_kills(opts = {})
       data, _status_code, _headers = get_universe_system_kills_with_http_info(opts)
-      data
+      return data
     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  ---  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, excluding wormhole space. Only systems with kills will be listed  ---  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
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetUniverseSystemKills200Ok>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_system_kills ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v2/universe/system_kills/'
+      local_var_path = "/v1/universe/system_kills/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1565,44 +1349,46 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get solar systems
     # Get a list of solar systems  ---  This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_systems(opts = {})
       data, _status_code, _headers = get_universe_systems_with_http_info(opts)
-      data
+      return data
     end
 
     # Get solar systems
     # Get a list of solar systems  ---  This route expires daily at 11:05
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @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] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_systems ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/universe/systems/'
+      local_var_path = "/v1/universe/systems/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1622,62 +1408,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get solar system information
-    # Get information on a solar system.  ---  This route expires daily at 11:05
+    # Get information on a solar system  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get solar system information
-    # Get information on a solar system.  ---  This route expires daily at 11:05
+    # Get information on a solar system  ---  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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseSystemsSystemIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_systems_system_id ..."
       end
       # verify the required parameter 'system_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'system_id' when calling UniverseApi.get_universe_systems_system_id" if system_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v4/universe/systems/{system_id}/'.sub('{' + 'system_id' + '}', system_id.to_s)
+      local_var_path = "/v2/universe/systems/{system_id}/".sub('{format}','json').sub('{' + 'system_id' + '}', system_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1697,51 +1477,53 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get types
     # Get a list of type ids  ---  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
-    # @option opts [Integer] :page Which page of results to return (default to 1)
+    # @option opts [Integer] :page Which page to query
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_universe_types(opts = {})
       data, _status_code, _headers = get_universe_types_with_http_info(opts)
-      data
+      return data
     end
 
     # Get types
     # Get a list of type ids  ---  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
+    # @option opts [Integer] :page Which page to query
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_types ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+      if !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 = '/v1/universe/types/'
+      local_var_path = "/v1/universe/types/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1761,62 +1543,56 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get type information
     # Get information on a type  ---  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] :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 (default to en-us)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @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)
-      data
+      return data
     end
 
     # Get type information
     # Get information on a type  ---  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
     # @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
+    # @option opts [String] :language Language to use in the response
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetUniverseTypesTypeIdOk, Fixnum, 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 ...'
+        @api_client.config.logger.debug "Calling API: UniverseApi.get_universe_types_type_id ..."
       end
       # verify the required parameter 'type_id' is set
-      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'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'type_id' when calling UniverseApi.get_universe_types_type_id" if type_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
+      if opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
         fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
       end
       # resource path
-      local_var_path = '/v3/universe/types/{type_id}/'.sub('{' + 'type_id' + '}', type_id.to_s)
+      local_var_path = "/v2/universe/types/{type_id}/".sub('{format}','json').sub('{' + 'type_id' + '}', type_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -1836,87 +1612,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
-    # Bulk names to IDs
-    # Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours.  --- 
-    # @param names 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] :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)
-    # @return [PostUniverseIdsOk]
-    def post_universe_ids(names, opts = {})
-      data, _status_code, _headers = post_universe_ids_with_http_info(names, opts)
-      data
-    end
-
-    # Bulk names to IDs
-    # Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours.  --- 
-    # @param names 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 = {})
-      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"
-      end
-      if @api_client.config.client_side_validation && opts[:'accept_language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'accept_language'])
-        fail ArgumentError, 'invalid value for "accept_language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
-      end
-      if @api_client.config.client_side_validation && opts[:'language'] && !['de', 'en-us', 'fr', 'ja', 'ru', 'zh'].include?(opts[:'language'])
-        fail ArgumentError, 'invalid value for "language", must be one of de, en-us, fr, ja, ru, zh'
-      end
-      # resource path
-      local_var_path = '/v1/universe/ids/'
-
-      # query parameters
-      query_params = {}
-      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
-      query_params[:'language'] = opts[:'language'] if !opts[:'language'].nil?
 
-      # header parameters
-      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?
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = @api_client.object_to_http_body(names)
-      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')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: UniverseApi#post_universe_ids\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
     # Get names and categories for a set of ID's
     # Resolve a set of IDs to names and categories. Supported ID's for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types.  --- 
     # @param ids The ids to resolve
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<PostUniverseNames200Ok>]
     def post_universe_names(ids, opts = {})
       data, _status_code, _headers = post_universe_names_with_http_info(ids, opts)
-      data
+      return data
     end
 
     # Get names and categories for a set of ID&#39;s
@@ -1924,31 +1631,31 @@ module ESIClient
     # @param ids The ids to resolve
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<PostUniverseNames200Ok>, Fixnum, Hash)>] Array<PostUniverseNames200Ok> data, response status code and response headers
     def post_universe_names_with_http_info(ids, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: UniverseApi.post_universe_names ...'
+        @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"
-      end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'ids' when calling UniverseApi.post_universe_names" if ids.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v2/universe/names/'
+      local_var_path = "/v2/universe/names/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       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[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}