docspring 1.4.1 → 3.0.0

data/lib/docspring/api/pdf_api.rb

@@ -1,16 +1,16 @@
 =begin
-#API v1
+#DocSpring API
 
-#DocSpring is a service that helps you fill out and sign PDF templates.
+#DocSpring provides an API that helps you fill out and sign PDF templates.
 
-OpenAPI spec version: v1
+The version of the OpenAPI document: v1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.0
+Generator version: 7.11.0
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module DocSpring
   class PDFApi
@@ -20,21 +20,21 @@ module DocSpring
       @api_client = api_client
     end
     # Add new fields to a Template
-    # @param template_id 
-    # @param add_fields_data 
+    # @param template_id [String] 
+    # @param data [AddFieldsData] 
     # @param [Hash] opts the optional parameters
-    # @return [AddFieldsTemplateResponse]
-    def add_fields_to_template(template_id, add_fields_data, opts = {})
-      data, _status_code, _headers = add_fields_to_template_with_http_info(template_id, add_fields_data, opts)
+    # @return [TemplateAddFieldsResponse]
+    def add_fields_to_template(template_id, data, opts = {})
+      data, _status_code, _headers = add_fields_to_template_with_http_info(template_id, data, opts)
       data
     end
 
     # Add new fields to a Template
-    # @param template_id 
-    # @param add_fields_data 
+    # @param template_id [String] 
+    # @param data [AddFieldsData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(AddFieldsTemplateResponse, Fixnum, Hash)>] AddFieldsTemplateResponse data, response status code and response headers
-    def add_fields_to_template_with_http_info(template_id, add_fields_data, opts = {})
+    # @return [Array<(TemplateAddFieldsResponse, Integer, Hash)>] TemplateAddFieldsResponse data, response status code and response headers
+    def add_fields_to_template_with_http_info(template_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.add_fields_to_template ...'
       end
@@ -42,148 +42,118 @@ module DocSpring
       if @api_client.config.client_side_validation && template_id.nil?
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.add_fields_to_template"
       end
-      # verify the required parameter 'add_fields_data' is set
-      if @api_client.config.client_side_validation && add_fields_data.nil?
-        fail ArgumentError, "Missing the required parameter 'add_fields_data' when calling PDFApi.add_fields_to_template"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.add_fields_to_template"
       end
       # resource path
-      local_var_path = '/templates/{template_id}/add_fields'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/add_fields'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(add_fields_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'AddFieldsTemplateResponse')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PDFApi#add_fields_to_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
-    # Generates multiple PDFs
-    # @param template_id 
-    # @param request_body 
-    # @param [Hash] opts the optional parameters
-    # @return [Array<CreateSubmissionResponse>]
-    def batch_generate_pdf_v1(template_id, request_body, opts = {})
-      data, _status_code, _headers = batch_generate_pdf_v1_with_http_info(template_id, request_body, opts)
-      data
-    end
-
-    # Generates multiple PDFs
-    # @param template_id 
-    # @param request_body 
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(Array<CreateSubmissionResponse>, Fixnum, Hash)>] Array<CreateSubmissionResponse> data, response status code and response headers
-    def batch_generate_pdf_v1_with_http_info(template_id, request_body, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: PDFApi.batch_generate_pdf_v1 ...'
-      end
-      # verify the required parameter 'template_id' is set
-      if @api_client.config.client_side_validation && template_id.nil?
-        fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.batch_generate_pdf_v1"
-      end
-      # verify the required parameter 'request_body' is set
-      if @api_client.config.client_side_validation && request_body.nil?
-        fail ArgumentError, "Missing the required parameter 'request_body' when calling PDFApi.batch_generate_pdf_v1"
-      end
-      # resource path
-      local_var_path = '/templates/{template_id}/submissions/batch'.sub('{' + 'template_id' + '}', template_id.to_s)
-
-      # query parameters
-      query_params = {}
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
 
-      # 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'])
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplateAddFieldsResponse'
 
-      # form parameters
-      form_params = {}
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
 
-      # http body (model)
-      post_body = @api_client.object_to_http_body(request_body)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      new_options = opts.merge(
+        :operation => :"PDFApi.add_fields_to_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<CreateSubmissionResponse>')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PDFApi#batch_generate_pdf_v1\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: PDFApi#add_fields_to_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
     # Generates multiple PDFs
-    # @param submission_batch_data 
+    # @param data [SubmissionBatchData] 
     # @param [Hash] opts the optional parameters
-    # @return [CreateSubmissionBatchResponse]
-    def batch_generate_pdfs(submission_batch_data, opts = {})
-      data, _status_code, _headers = batch_generate_pdfs_with_http_info(submission_batch_data, opts)
+    # @option opts [Boolean] :wait Wait for submission batch to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [BatchGeneratePdfs201Response]
+    def batch_generate_pdfs(data, opts = {})
+      data, _status_code, _headers = batch_generate_pdfs_with_http_info(data, opts)
       data
     end
 
     # Generates multiple PDFs
-    # @param submission_batch_data 
+    # @param data [SubmissionBatchData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateSubmissionBatchResponse, Fixnum, Hash)>] CreateSubmissionBatchResponse data, response status code and response headers
-    def batch_generate_pdfs_with_http_info(submission_batch_data, opts = {})
+    # @option opts [Boolean] :wait Wait for submission batch to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [Array<(BatchGeneratePdfs201Response, Integer, Hash)>] BatchGeneratePdfs201Response data, response status code and response headers
+    def batch_generate_pdfs_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.batch_generate_pdfs ...'
       end
-      # verify the required parameter 'submission_batch_data' is set
-      if @api_client.config.client_side_validation && submission_batch_data.nil?
-        fail ArgumentError, "Missing the required parameter 'submission_batch_data' when calling PDFApi.batch_generate_pdfs"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.batch_generate_pdfs"
       end
       # resource path
       local_var_path = '/submissions/batches'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
+      query_params[:'wait'] = opts[:'wait'] if !opts[:'wait'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(submission_batch_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'BatchGeneratePdfs201Response'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.batch_generate_pdfs",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateSubmissionBatchResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#batch_generate_pdfs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -191,52 +161,65 @@ module DocSpring
     end
 
     # Merge submission PDFs, template PDFs, or custom files
-    # @param combine_pdfs_data 
+    # @param data [CombinePdfsData] 
     # @param [Hash] opts the optional parameters
     # @return [CreateCombinedSubmissionResponse]
-    def combine_pdfs(combine_pdfs_data, opts = {})
-      data, _status_code, _headers = combine_pdfs_with_http_info(combine_pdfs_data, opts)
+    def combine_pdfs(data, opts = {})
+      data, _status_code, _headers = combine_pdfs_with_http_info(data, opts)
       data
     end
 
     # Merge submission PDFs, template PDFs, or custom files
-    # @param combine_pdfs_data 
+    # @param data [CombinePdfsData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateCombinedSubmissionResponse, Fixnum, Hash)>] CreateCombinedSubmissionResponse data, response status code and response headers
-    def combine_pdfs_with_http_info(combine_pdfs_data, opts = {})
+    # @return [Array<(CreateCombinedSubmissionResponse, Integer, Hash)>] CreateCombinedSubmissionResponse data, response status code and response headers
+    def combine_pdfs_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.combine_pdfs ...'
       end
-      # verify the required parameter 'combine_pdfs_data' is set
-      if @api_client.config.client_side_validation && combine_pdfs_data.nil?
-        fail ArgumentError, "Missing the required parameter 'combine_pdfs_data' when calling PDFApi.combine_pdfs"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.combine_pdfs"
       end
       # resource path
       local_var_path = '/combined_submissions?v=2'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(combine_pdfs_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateCombinedSubmissionResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.combine_pdfs",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateCombinedSubmissionResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#combine_pdfs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -244,52 +227,68 @@ module DocSpring
     end
 
     # Merge generated PDFs together
-    # @param combined_submission_data 
+    # @param data [CombinedSubmissionData] 
     # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for combined submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
     # @return [CreateCombinedSubmissionResponse]
-    def combine_submissions(combined_submission_data, opts = {})
-      data, _status_code, _headers = combine_submissions_with_http_info(combined_submission_data, opts)
+    def combine_submissions(data, opts = {})
+      data, _status_code, _headers = combine_submissions_with_http_info(data, opts)
       data
     end
 
     # Merge generated PDFs together
-    # @param combined_submission_data 
+    # @param data [CombinedSubmissionData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateCombinedSubmissionResponse, Fixnum, Hash)>] CreateCombinedSubmissionResponse data, response status code and response headers
-    def combine_submissions_with_http_info(combined_submission_data, opts = {})
+    # @option opts [Boolean] :wait Wait for combined submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [Array<(CreateCombinedSubmissionResponse, Integer, Hash)>] CreateCombinedSubmissionResponse data, response status code and response headers
+    def combine_submissions_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.combine_submissions ...'
       end
-      # verify the required parameter 'combined_submission_data' is set
-      if @api_client.config.client_side_validation && combined_submission_data.nil?
-        fail ArgumentError, "Missing the required parameter 'combined_submission_data' when calling PDFApi.combine_submissions"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.combine_submissions"
       end
       # resource path
       local_var_path = '/combined_submissions'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
+      query_params[:'wait'] = opts[:'wait'] if !opts[:'wait'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(combined_submission_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateCombinedSubmissionResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.combine_submissions",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateCombinedSubmissionResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#combine_submissions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -297,21 +296,21 @@ module DocSpring
     end
 
     # Copy a Template
-    # @param template_id 
-    # @param copy_template_data 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Template]
-    def copy_template(template_id, copy_template_data, opts = {})
-      data, _status_code, _headers = copy_template_with_http_info(template_id, copy_template_data, opts)
+    # @option opts [CopyTemplateOptions] :options 
+    # @return [TemplatePreview]
+    def copy_template(template_id, opts = {})
+      data, _status_code, _headers = copy_template_with_http_info(template_id, opts)
       data
     end
 
     # Copy a Template
-    # @param template_id 
-    # @param copy_template_data 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Template, Fixnum, Hash)>] Template data, response status code and response headers
-    def copy_template_with_http_info(template_id, copy_template_data, opts = {})
+    # @option opts [CopyTemplateOptions] :options 
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
+    def copy_template_with_http_info(template_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.copy_template ...'
       end
@@ -319,36 +318,45 @@ module DocSpring
       if @api_client.config.client_side_validation && template_id.nil?
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.copy_template"
       end
-      # verify the required parameter 'copy_template_data' is set
-      if @api_client.config.client_side_validation && copy_template_data.nil?
-        fail ArgumentError, "Missing the required parameter 'copy_template_data' when calling PDFApi.copy_template"
-      end
       # resource path
-      local_var_path = '/templates/{template_id}/copy'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/copy'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(copy_template_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(opts[:'options'])
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.copy_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Template')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#copy_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -356,61 +364,147 @@ module DocSpring
     end
 
     # Create a new custom file from a cached presign upload
-    # @param create_custom_file_data 
+    # @param data [CreateCustomFileData] 
     # @param [Hash] opts the optional parameters
     # @return [CreateCustomFileResponse]
-    def create_custom_file_from_upload(create_custom_file_data, opts = {})
-      data, _status_code, _headers = create_custom_file_from_upload_with_http_info(create_custom_file_data, opts)
+    def create_custom_file_from_upload(data, opts = {})
+      data, _status_code, _headers = create_custom_file_from_upload_with_http_info(data, opts)
       data
     end
 
     # Create a new custom file from a cached presign upload
-    # @param create_custom_file_data 
+    # @param data [CreateCustomFileData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateCustomFileResponse, Fixnum, Hash)>] CreateCustomFileResponse data, response status code and response headers
-    def create_custom_file_from_upload_with_http_info(create_custom_file_data, opts = {})
+    # @return [Array<(CreateCustomFileResponse, Integer, Hash)>] CreateCustomFileResponse data, response status code and response headers
+    def create_custom_file_from_upload_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_custom_file_from_upload ...'
       end
-      # verify the required parameter 'create_custom_file_data' is set
-      if @api_client.config.client_side_validation && create_custom_file_data.nil?
-        fail ArgumentError, "Missing the required parameter 'create_custom_file_data' when calling PDFApi.create_custom_file_from_upload"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.create_custom_file_from_upload"
       end
       # resource path
       local_var_path = '/custom_files'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(create_custom_file_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateCustomFileResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_custom_file_from_upload",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateCustomFileResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_custom_file_from_upload\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
+    # Creates a new event for emailing a signee a request for signature
+    # @param data_request_id [String] 
+    # @param event [CreateSubmissionDataRequestEventRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [CreateSubmissionDataRequestEventResponse]
+    def create_data_request_event(data_request_id, event, opts = {})
+      data, _status_code, _headers = create_data_request_event_with_http_info(data_request_id, event, opts)
+      data
+    end
+
+    # Creates a new event for emailing a signee a request for signature
+    # @param data_request_id [String] 
+    # @param event [CreateSubmissionDataRequestEventRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(CreateSubmissionDataRequestEventResponse, Integer, Hash)>] CreateSubmissionDataRequestEventResponse data, response status code and response headers
+    def create_data_request_event_with_http_info(data_request_id, event, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PDFApi.create_data_request_event ...'
+      end
+      # verify the required parameter 'data_request_id' is set
+      if @api_client.config.client_side_validation && data_request_id.nil?
+        fail ArgumentError, "Missing the required parameter 'data_request_id' when calling PDFApi.create_data_request_event"
+      end
+      # verify the required parameter 'event' is set
+      if @api_client.config.client_side_validation && event.nil?
+        fail ArgumentError, "Missing the required parameter 'event' when calling PDFApi.create_data_request_event"
+      end
+      # resource path
+      local_var_path = '/data_requests/{data_request_id}/events'.sub('{' + 'data_request_id' + '}', CGI.escape(data_request_id.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(event)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateSubmissionDataRequestEventResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_data_request_event",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PDFApi#create_data_request_event\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Creates a new data request token for form authentication
-    # @param data_request_id 
+    # @param data_request_id [String] 
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :type 
     # @return [CreateSubmissionDataRequestTokenResponse]
     def create_data_request_token(data_request_id, opts = {})
       data, _status_code, _headers = create_data_request_token_with_http_info(data_request_id, opts)
@@ -418,9 +512,10 @@ module DocSpring
     end
 
     # Creates a new data request token for form authentication
-    # @param data_request_id 
+    # @param data_request_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateSubmissionDataRequestTokenResponse, Fixnum, Hash)>] CreateSubmissionDataRequestTokenResponse data, response status code and response headers
+    # @option opts [String] :type 
+    # @return [Array<(CreateSubmissionDataRequestTokenResponse, Integer, Hash)>] CreateSubmissionDataRequestTokenResponse data, response status code and response headers
     def create_data_request_token_with_http_info(data_request_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_data_request_token ...'
@@ -429,30 +524,45 @@ module DocSpring
       if @api_client.config.client_side_validation && data_request_id.nil?
         fail ArgumentError, "Missing the required parameter 'data_request_id' when calling PDFApi.create_data_request_token"
       end
+      allowable_values = ["api", "email"]
+      if @api_client.config.client_side_validation && opts[:'type'] && !allowable_values.include?(opts[:'type'])
+        fail ArgumentError, "invalid value for \"type\", must be one of #{allowable_values}"
+      end
       # resource path
-      local_var_path = '/data_requests/{data_request_id}/tokens'.sub('{' + 'data_request_id' + '}', data_request_id.to_s)
+      local_var_path = '/data_requests/{data_request_id}/tokens'.sub('{' + 'data_request_id' + '}', CGI.escape(data_request_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
+      query_params[:'type'] = opts[:'type'] if !opts[:'type'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateSubmissionDataRequestTokenResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_data_request_token",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateSubmissionDataRequestTokenResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_data_request_token\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -460,52 +570,65 @@ module DocSpring
     end
 
     # Create a folder
-    # @param create_folder_data 
+    # @param data [CreateFolderData] 
     # @param [Hash] opts the optional parameters
     # @return [Folder]
-    def create_folder(create_folder_data, opts = {})
-      data, _status_code, _headers = create_folder_with_http_info(create_folder_data, opts)
+    def create_folder(data, opts = {})
+      data, _status_code, _headers = create_folder_with_http_info(data, opts)
       data
     end
 
     # Create a folder
-    # @param create_folder_data 
+    # @param data [CreateFolderData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Folder, Fixnum, Hash)>] Folder data, response status code and response headers
-    def create_folder_with_http_info(create_folder_data, opts = {})
+    # @return [Array<(Folder, Integer, Hash)>] Folder data, response status code and response headers
+    def create_folder_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_folder ...'
       end
-      # verify the required parameter 'create_folder_data' is set
-      if @api_client.config.client_side_validation && create_folder_data.nil?
-        fail ArgumentError, "Missing the required parameter 'create_folder_data' when calling PDFApi.create_folder"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.create_folder"
       end
       # resource path
       local_var_path = '/folders/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(create_folder_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Folder'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_folder",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Folder')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_folder\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -513,52 +636,65 @@ module DocSpring
     end
 
     # Create a new HTML template
-    # @param create_html_template_data 
+    # @param data [CreateHtmlTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [PendingTemplate]
-    def create_html_template(create_html_template_data, opts = {})
-      data, _status_code, _headers = create_html_template_with_http_info(create_html_template_data, opts)
+    # @return [TemplatePreview]
+    def create_html_template(data, opts = {})
+      data, _status_code, _headers = create_html_template_with_http_info(data, opts)
       data
     end
 
     # Create a new HTML template
-    # @param create_html_template_data 
+    # @param data [CreateHtmlTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(PendingTemplate, Fixnum, Hash)>] PendingTemplate data, response status code and response headers
-    def create_html_template_with_http_info(create_html_template_data, opts = {})
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
+    def create_html_template_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_html_template ...'
       end
-      # verify the required parameter 'create_html_template_data' is set
-      if @api_client.config.client_side_validation && create_html_template_data.nil?
-        fail ArgumentError, "Missing the required parameter 'create_html_template_data' when calling PDFApi.create_html_template"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.create_html_template"
       end
       # resource path
-      local_var_path = '/templates?desc=html'
+      local_var_path = '/templates?endpoint_description=html'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(create_html_template_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_html_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'PendingTemplate')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_html_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -566,22 +702,26 @@ module DocSpring
     end
 
     # Create a new PDF template with a form POST file upload
-    # @param template_document 
-    # @param template_name 
+    # @param template_document [File] 
+    # @param template_name [String] 
     # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for template document to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @option opts [String] :template_description 
     # @option opts [String] :template_parent_folder_id 
-    # @return [PendingTemplate]
+    # @return [TemplatePreview]
     def create_pdf_template(template_document, template_name, opts = {})
       data, _status_code, _headers = create_pdf_template_with_http_info(template_document, template_name, opts)
       data
     end
 
     # Create a new PDF template with a form POST file upload
-    # @param template_document 
-    # @param template_name 
+    # @param template_document [File] 
+    # @param template_name [String] 
     # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for template document to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @option opts [String] :template_description 
     # @option opts [String] :template_parent_folder_id 
-    # @return [Array<(PendingTemplate, Fixnum, Hash)>] PendingTemplate data, response status code and response headers
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
     def create_pdf_template_with_http_info(template_document, template_name, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_pdf_template ...'
@@ -598,31 +738,46 @@ module DocSpring
       local_var_path = '/templates'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
+      query_params[:'wait'] = opts[:'wait'] if !opts[:'wait'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
+      content_type = @api_client.select_header_content_type(['multipart/form-data'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
       form_params['template[document]'] = template_document
       form_params['template[name]'] = template_name
+      form_params['template[description]'] = opts[:'template_description'] if !opts[:'template_description'].nil?
       form_params['template[parent_folder_id]'] = opts[:'template_parent_folder_id'] if !opts[:'template_parent_folder_id'].nil?
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_pdf_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'PendingTemplate')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_pdf_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -630,52 +785,65 @@ module DocSpring
     end
 
     # Create a new PDF template from a cached presign upload
-    # @param create_template_from_upload_data 
+    # @param data [CreatePdfTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [PendingTemplate]
-    def create_pdf_template_from_upload(create_template_from_upload_data, opts = {})
-      data, _status_code, _headers = create_pdf_template_from_upload_with_http_info(create_template_from_upload_data, opts)
+    # @return [TemplatePreview]
+    def create_pdf_template_from_upload(data, opts = {})
+      data, _status_code, _headers = create_pdf_template_from_upload_with_http_info(data, opts)
       data
     end
 
     # Create a new PDF template from a cached presign upload
-    # @param create_template_from_upload_data 
+    # @param data [CreatePdfTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(PendingTemplate, Fixnum, Hash)>] PendingTemplate data, response status code and response headers
-    def create_pdf_template_from_upload_with_http_info(create_template_from_upload_data, opts = {})
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
+    def create_pdf_template_from_upload_with_http_info(data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.create_pdf_template_from_upload ...'
       end
-      # verify the required parameter 'create_template_from_upload_data' is set
-      if @api_client.config.client_side_validation && create_template_from_upload_data.nil?
-        fail ArgumentError, "Missing the required parameter 'create_template_from_upload_data' when calling PDFApi.create_pdf_template_from_upload"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.create_pdf_template_from_upload"
       end
       # resource path
-      local_var_path = '/templates?desc=cached_upload'
+      local_var_path = '/templates?endpoint_description=cached_upload'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(create_template_from_upload_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.create_pdf_template_from_upload",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'PendingTemplate')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#create_pdf_template_from_upload\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -683,7 +851,7 @@ module DocSpring
     end
 
     # Delete a folder
-    # @param folder_id 
+    # @param folder_id [String] 
     # @param [Hash] opts the optional parameters
     # @return [Folder]
     def delete_folder(folder_id, opts = {})
@@ -692,9 +860,9 @@ module DocSpring
     end
 
     # Delete a folder
-    # @param folder_id 
+    # @param folder_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Folder, Fixnum, Hash)>] Folder data, response status code and response headers
+    # @return [Array<(Folder, Integer, Hash)>] Folder data, response status code and response headers
     def delete_folder_with_http_info(folder_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.delete_folder ...'
@@ -704,37 +872,108 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'folder_id' when calling PDFApi.delete_folder"
       end
       # resource path
-      local_var_path = '/folders/{folder_id}'.sub('{' + 'folder_id' + '}', folder_id.to_s)
+      local_var_path = '/folders/{folder_id}'.sub('{' + 'folder_id' + '}', CGI.escape(folder_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Folder'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.delete_folder",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Folder')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#delete_folder\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
+    # Delete a template
+    # @param template_id [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [SuccessMultipleErrorsResponse]
+    def delete_template(template_id, opts = {})
+      data, _status_code, _headers = delete_template_with_http_info(template_id, opts)
+      data
+    end
+
+    # Delete a template
+    # @param template_id [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(SuccessMultipleErrorsResponse, Integer, Hash)>] SuccessMultipleErrorsResponse data, response status code and response headers
+    def delete_template_with_http_info(template_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PDFApi.delete_template ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.delete_template"
+      end
+      # resource path
+      local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SuccessMultipleErrorsResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.delete_template",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PDFApi#delete_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Expire a combined submission
-    # @param combined_submission_id 
+    # @param combined_submission_id [String] 
     # @param [Hash] opts the optional parameters
     # @return [CombinedSubmission]
     def expire_combined_submission(combined_submission_id, opts = {})
@@ -743,9 +982,9 @@ module DocSpring
     end
 
     # Expire a combined submission
-    # @param combined_submission_id 
+    # @param combined_submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CombinedSubmission, Fixnum, Hash)>] CombinedSubmission data, response status code and response headers
+    # @return [Array<(CombinedSubmission, Integer, Hash)>] CombinedSubmission data, response status code and response headers
     def expire_combined_submission_with_http_info(combined_submission_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.expire_combined_submission ...'
@@ -755,29 +994,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'combined_submission_id' when calling PDFApi.expire_combined_submission"
       end
       # resource path
-      local_var_path = '/combined_submissions/{combined_submission_id}'.sub('{' + 'combined_submission_id' + '}', combined_submission_id.to_s)
+      local_var_path = '/combined_submissions/{combined_submission_id}'.sub('{' + 'combined_submission_id' + '}', CGI.escape(combined_submission_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CombinedSubmission'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.expire_combined_submission",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CombinedSubmission')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#expire_combined_submission\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -785,18 +1034,18 @@ module DocSpring
     end
 
     # Expire a PDF submission
-    # @param submission_id 
+    # @param submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Submission]
+    # @return [SubmissionPreview]
     def expire_submission(submission_id, opts = {})
       data, _status_code, _headers = expire_submission_with_http_info(submission_id, opts)
       data
     end
 
     # Expire a PDF submission
-    # @param submission_id 
+    # @param submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Submission, Fixnum, Hash)>] Submission data, response status code and response headers
+    # @return [Array<(SubmissionPreview, Integer, Hash)>] SubmissionPreview data, response status code and response headers
     def expire_submission_with_http_info(submission_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.expire_submission ...'
@@ -806,29 +1055,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'submission_id' when calling PDFApi.expire_submission"
       end
       # resource path
-      local_var_path = '/submissions/{submission_id}'.sub('{' + 'submission_id' + '}', submission_id.to_s)
+      local_var_path = '/submissions/{submission_id}'.sub('{' + 'submission_id' + '}', CGI.escape(submission_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SubmissionPreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.expire_submission",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Submission')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#expire_submission\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -836,21 +1095,23 @@ module DocSpring
     end
 
     # Generates a new PDF
-    # @param template_id 
-    # @param submission_data 
+    # @param template_id [String] 
+    # @param submission [CreatePdfSubmissionData] 
     # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
     # @return [CreateSubmissionResponse]
-    def generate_pdf(template_id, submission_data, opts = {})
-      data, _status_code, _headers = generate_pdf_with_http_info(template_id, submission_data, opts)
+    def generate_pdf(template_id, submission, opts = {})
+      data, _status_code, _headers = generate_pdf_with_http_info(template_id, submission, opts)
       data
     end
 
     # Generates a new PDF
-    # @param template_id 
-    # @param submission_data 
+    # @param template_id [String] 
+    # @param submission [CreatePdfSubmissionData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CreateSubmissionResponse, Fixnum, Hash)>] CreateSubmissionResponse data, response status code and response headers
-    def generate_pdf_with_http_info(template_id, submission_data, opts = {})
+    # @option opts [Boolean] :wait Wait for submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [Array<(CreateSubmissionResponse, Integer, Hash)>] CreateSubmissionResponse data, response status code and response headers
+    def generate_pdf_with_http_info(template_id, submission, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.generate_pdf ...'
       end
@@ -858,44 +1119,194 @@ module DocSpring
       if @api_client.config.client_side_validation && template_id.nil?
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.generate_pdf"
       end
-      # verify the required parameter 'submission_data' is set
-      if @api_client.config.client_side_validation && submission_data.nil?
-        fail ArgumentError, "Missing the required parameter 'submission_data' when calling PDFApi.generate_pdf"
+      # verify the required parameter 'submission' is set
+      if @api_client.config.client_side_validation && submission.nil?
+        fail ArgumentError, "Missing the required parameter 'submission' when calling PDFApi.generate_pdf"
       end
       # resource path
-      local_var_path = '/templates/{template_id}/submissions'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/submissions'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
+      query_params[:'wait'] = opts[:'wait'] if !opts[:'wait'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(submission_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(submission)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateSubmissionResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.generate_pdf",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CreateSubmissionResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#generate_pdf\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
+    # Generates a new PDF for an HTML template
+    # @param template_id [String] 
+    # @param submission [CreateHtmlSubmissionData] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [CreateSubmissionResponse]
+    def generate_pdf_for_html_template(template_id, submission, opts = {})
+      data, _status_code, _headers = generate_pdf_for_html_template_with_http_info(template_id, submission, opts)
+      data
+    end
+
+    # Generates a new PDF for an HTML template
+    # @param template_id [String] 
+    # @param submission [CreateHtmlSubmissionData] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [Boolean] :wait Wait for submission to be processed before returning. Set to false to return immediately. Default: true (on sync.* subdomain) (default to true)
+    # @return [Array<(CreateSubmissionResponse, Integer, Hash)>] CreateSubmissionResponse data, response status code and response headers
+    def generate_pdf_for_html_template_with_http_info(template_id, submission, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PDFApi.generate_pdf_for_html_template ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.generate_pdf_for_html_template"
+      end
+      # verify the required parameter 'submission' is set
+      if @api_client.config.client_side_validation && submission.nil?
+        fail ArgumentError, "Missing the required parameter 'submission' when calling PDFApi.generate_pdf_for_html_template"
+      end
+      # resource path
+      local_var_path = '/templates/{template_id}/submissions?endpoint_description=html_templates'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      query_params[:'wait'] = opts[:'wait'] if !opts[:'wait'].nil?
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(submission)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateSubmissionResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.generate_pdf_for_html_template",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PDFApi#generate_pdf_for_html_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Generated a preview PDF for partially completed data requests
+    # @param submission_id [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [SuccessErrorResponse]
+    def generate_preview(submission_id, opts = {})
+      data, _status_code, _headers = generate_preview_with_http_info(submission_id, opts)
+      data
+    end
+
+    # Generated a preview PDF for partially completed data requests
+    # @param submission_id [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(SuccessErrorResponse, Integer, Hash)>] SuccessErrorResponse data, response status code and response headers
+    def generate_preview_with_http_info(submission_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PDFApi.generate_preview ...'
+      end
+      # verify the required parameter 'submission_id' is set
+      if @api_client.config.client_side_validation && submission_id.nil?
+        fail ArgumentError, "Missing the required parameter 'submission_id' when calling PDFApi.generate_preview"
+      end
+      # resource path
+      local_var_path = '/submissions/{submission_id}/generate_preview'.sub('{' + 'submission_id' + '}', CGI.escape(submission_id.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SuccessErrorResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.generate_preview",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PDFApi#generate_preview\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Check the status of a combined submission (merged PDFs)
-    # @param combined_submission_id 
+    # @param combined_submission_id [String] 
     # @param [Hash] opts the optional parameters
     # @return [CombinedSubmission]
     def get_combined_submission(combined_submission_id, opts = {})
@@ -904,9 +1315,9 @@ module DocSpring
     end
 
     # Check the status of a combined submission (merged PDFs)
-    # @param combined_submission_id 
+    # @param combined_submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(CombinedSubmission, Fixnum, Hash)>] CombinedSubmission data, response status code and response headers
+    # @return [Array<(CombinedSubmission, Integer, Hash)>] CombinedSubmission data, response status code and response headers
     def get_combined_submission_with_http_info(combined_submission_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_combined_submission ...'
@@ -916,29 +1327,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'combined_submission_id' when calling PDFApi.get_combined_submission"
       end
       # resource path
-      local_var_path = '/combined_submissions/{combined_submission_id}'.sub('{' + 'combined_submission_id' + '}', combined_submission_id.to_s)
+      local_var_path = '/combined_submissions/{combined_submission_id}'.sub('{' + 'combined_submission_id' + '}', CGI.escape(combined_submission_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CombinedSubmission'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_combined_submission",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'CombinedSubmission')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_combined_submission\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -946,18 +1367,18 @@ module DocSpring
     end
 
     # Look up a submission data request
-    # @param data_request_id 
+    # @param data_request_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [SubmissionDataRequest]
+    # @return [SubmissionDataRequestShow]
     def get_data_request(data_request_id, opts = {})
       data, _status_code, _headers = get_data_request_with_http_info(data_request_id, opts)
       data
     end
 
     # Look up a submission data request
-    # @param data_request_id 
+    # @param data_request_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(SubmissionDataRequest, Fixnum, Hash)>] SubmissionDataRequest data, response status code and response headers
+    # @return [Array<(SubmissionDataRequestShow, Integer, Hash)>] SubmissionDataRequestShow data, response status code and response headers
     def get_data_request_with_http_info(data_request_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_data_request ...'
@@ -967,29 +1388,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'data_request_id' when calling PDFApi.get_data_request"
       end
       # resource path
-      local_var_path = '/data_requests/{data_request_id}'.sub('{' + 'data_request_id' + '}', data_request_id.to_s)
+      local_var_path = '/data_requests/{data_request_id}'.sub('{' + 'data_request_id' + '}', CGI.escape(data_request_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SubmissionDataRequestShow'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_data_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'SubmissionDataRequest')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_data_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -997,18 +1428,18 @@ module DocSpring
     end
 
     # Fetch the full template attributes
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Template1]
+    # @return [Template]
     def get_full_template(template_id, opts = {})
       data, _status_code, _headers = get_full_template_with_http_info(template_id, opts)
       data
     end
 
     # Fetch the full template attributes
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Template1, Fixnum, Hash)>] Template1 data, response status code and response headers
+    # @return [Array<(Template, Integer, Hash)>] Template data, response status code and response headers
     def get_full_template_with_http_info(template_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_full_template ...'
@@ -1018,29 +1449,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.get_full_template"
       end
       # resource path
-      local_var_path = '/templates/{template_id}?full=true'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}?full=true'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Template'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_full_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Template1')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_full_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1049,7 +1490,7 @@ module DocSpring
 
     # Get a presigned URL so that you can upload a file to our AWS S3 bucket
     # @param [Hash] opts the optional parameters
-    # @return [Hash<String, Object>]
+    # @return [UploadPresignResponse]
     def get_presign_url(opts = {})
       data, _status_code, _headers = get_presign_url_with_http_info(opts)
       data
@@ -1057,7 +1498,7 @@ module DocSpring
 
     # Get a presigned URL so that you can upload a file to our AWS S3 bucket
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Hash<String, Object>, Fixnum, Hash)>] Hash<String, Object> data, response status code and response headers
+    # @return [Array<(UploadPresignResponse, Integer, Hash)>] UploadPresignResponse data, response status code and response headers
     def get_presign_url_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_presign_url ...'
@@ -1066,26 +1507,36 @@ module DocSpring
       local_var_path = '/uploads/presign'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'UploadPresignResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_presign_url",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Hash<String, Object>')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_presign_url\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1093,9 +1544,9 @@ module DocSpring
     end
 
     # Check the status of a PDF
-    # @param submission_id 
+    # @param submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :include_data 
+    # @option opts [Boolean] :include_data 
     # @return [Submission]
     def get_submission(submission_id, opts = {})
       data, _status_code, _headers = get_submission_with_http_info(submission_id, opts)
@@ -1103,10 +1554,10 @@ module DocSpring
     end
 
     # Check the status of a PDF
-    # @param submission_id 
+    # @param submission_id [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :include_data 
-    # @return [Array<(Submission, Fixnum, Hash)>] Submission data, response status code and response headers
+    # @option opts [Boolean] :include_data 
+    # @return [Array<(Submission, Integer, Hash)>] Submission data, response status code and response headers
     def get_submission_with_http_info(submission_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_submission ...'
@@ -1116,30 +1567,40 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'submission_id' when calling PDFApi.get_submission"
       end
       # resource path
-      local_var_path = '/submissions/{submission_id}'.sub('{' + 'submission_id' + '}', submission_id.to_s)
+      local_var_path = '/submissions/{submission_id}'.sub('{' + 'submission_id' + '}', CGI.escape(submission_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'include_data'] = opts[:'include_data'] if !opts[:'include_data'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Submission'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_submission",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Submission')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_submission\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1147,20 +1608,20 @@ module DocSpring
     end
 
     # Check the status of a submission batch job
-    # @param submission_batch_id 
+    # @param submission_batch_id [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :include_submissions 
-    # @return [SubmissionBatch]
+    # @option opts [Boolean] :include_submissions 
+    # @return [SubmissionBatchWithSubmissions]
     def get_submission_batch(submission_batch_id, opts = {})
       data, _status_code, _headers = get_submission_batch_with_http_info(submission_batch_id, opts)
       data
     end
 
     # Check the status of a submission batch job
-    # @param submission_batch_id 
+    # @param submission_batch_id [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :include_submissions 
-    # @return [Array<(SubmissionBatch, Fixnum, Hash)>] SubmissionBatch data, response status code and response headers
+    # @option opts [Boolean] :include_submissions 
+    # @return [Array<(SubmissionBatchWithSubmissions, Integer, Hash)>] SubmissionBatchWithSubmissions data, response status code and response headers
     def get_submission_batch_with_http_info(submission_batch_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_submission_batch ...'
@@ -1170,30 +1631,40 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'submission_batch_id' when calling PDFApi.get_submission_batch"
       end
       # resource path
-      local_var_path = '/submissions/batches/{submission_batch_id}'.sub('{' + 'submission_batch_id' + '}', submission_batch_id.to_s)
+      local_var_path = '/submissions/batches/{submission_batch_id}'.sub('{' + 'submission_batch_id' + '}', CGI.escape(submission_batch_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'include_submissions'] = opts[:'include_submissions'] if !opts[:'include_submissions'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SubmissionBatchWithSubmissions'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_submission_batch",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'SubmissionBatch')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_submission_batch\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1201,18 +1672,18 @@ module DocSpring
     end
 
     # Check the status of an uploaded template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Template]
+    # @return [TemplatePreview]
     def get_template(template_id, opts = {})
       data, _status_code, _headers = get_template_with_http_info(template_id, opts)
       data
     end
 
     # Check the status of an uploaded template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Template, Fixnum, Hash)>] Template data, response status code and response headers
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
     def get_template_with_http_info(template_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_template ...'
@@ -1222,29 +1693,39 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.get_template"
       end
       # resource path
-      local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Template')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1252,18 +1733,18 @@ module DocSpring
     end
 
     # Fetch the JSON schema for a template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Hash<String, Object>]
+    # @return [JsonSchema]
     def get_template_schema(template_id, opts = {})
       data, _status_code, _headers = get_template_schema_with_http_info(template_id, opts)
       data
     end
 
     # Fetch the JSON schema for a template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Hash<String, Object>, Fixnum, Hash)>] Hash<String, Object> data, response status code and response headers
+    # @return [Array<(JsonSchema, Integer, Hash)>] JsonSchema data, response status code and response headers
     def get_template_schema_with_http_info(template_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.get_template_schema ...'
@@ -1273,35 +1754,118 @@ module DocSpring
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.get_template_schema"
       end
       # resource path
-      local_var_path = '/templates/{template_id}/schema'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/schema'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'JsonSchema'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.get_template_schema",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Hash<String, Object>')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#get_template_schema\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
+    # Get a list of all combined submissions
+    # @param [Hash] opts the optional parameters
+    # @option opts [Integer] :page Default: 1
+    # @option opts [Integer] :per_page Default: 50
+    # @return [Array<CombinedSubmission>]
+    def list_combined_submissions(opts = {})
+      data, _status_code, _headers = list_combined_submissions_with_http_info(opts)
+      data
+    end
+
+    # Get a list of all combined submissions
+    # @param [Hash] opts the optional parameters
+    # @option opts [Integer] :page Default: 1
+    # @option opts [Integer] :per_page Default: 50
+    # @return [Array<(Array<CombinedSubmission>, Integer, Hash)>] Array<CombinedSubmission> data, response status code and response headers
+    def list_combined_submissions_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PDFApi.list_combined_submissions ...'
+      end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling PDFApi.list_combined_submissions, must be greater than or equal to 1.'
+      end
+
+      if @api_client.config.client_side_validation && !opts[:'per_page'].nil? && opts[:'per_page'] > 50
+        fail ArgumentError, 'invalid value for "opts[:"per_page"]" when calling PDFApi.list_combined_submissions, must be smaller than or equal to 50.'
+      end
+
+      if @api_client.config.client_side_validation && !opts[:'per_page'].nil? && opts[:'per_page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"per_page"]" when calling PDFApi.list_combined_submissions, must be greater than or equal to 1.'
+      end
+
+      # resource path
+      local_var_path = '/combined_submissions'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
+      query_params[:'per_page'] = opts[:'per_page'] if !opts[:'per_page'].nil?
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<CombinedSubmission>'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.list_combined_submissions",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PDFApi#list_combined_submissions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get a list of all folders
     # @param [Hash] opts the optional parameters
     # @option opts [String] :parent_folder_id Filter By Folder Id
@@ -1314,7 +1878,7 @@ module DocSpring
     # Get a list of all folders
     # @param [Hash] opts the optional parameters
     # @option opts [String] :parent_folder_id Filter By Folder Id
-    # @return [Array<(Array<Folder>, Fixnum, Hash)>] Array<Folder> data, response status code and response headers
+    # @return [Array<(Array<Folder>, Integer, Hash)>] Array<Folder> data, response status code and response headers
     def list_folders_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.list_folders ...'
@@ -1323,27 +1887,37 @@ module DocSpring
       local_var_path = '/folders/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'parent_folder_id'] = opts[:'parent_folder_id'] if !opts[:'parent_folder_id'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<Folder>'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.list_folders",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Folder>')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#list_folders\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1357,7 +1931,7 @@ module DocSpring
     # @option opts [String] :created_after 
     # @option opts [String] :created_before 
     # @option opts [String] :type 
-    # @option opts [BOOLEAN] :include_data 
+    # @option opts [Boolean] :include_data 
     # @return [ListSubmissionsResponse]
     def list_submissions(opts = {})
       data, _status_code, _headers = list_submissions_with_http_info(opts)
@@ -1371,8 +1945,8 @@ module DocSpring
     # @option opts [String] :created_after 
     # @option opts [String] :created_before 
     # @option opts [String] :type 
-    # @option opts [BOOLEAN] :include_data 
-    # @return [Array<(ListSubmissionsResponse, Fixnum, Hash)>] ListSubmissionsResponse data, response status code and response headers
+    # @option opts [Boolean] :include_data 
+    # @return [Array<(ListSubmissionsResponse, Integer, Hash)>] ListSubmissionsResponse data, response status code and response headers
     def list_submissions_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.list_submissions ...'
@@ -1381,7 +1955,7 @@ module DocSpring
       local_var_path = '/submissions'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
       query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
       query_params[:'created_after'] = opts[:'created_after'] if !opts[:'created_after'].nil?
@@ -1390,23 +1964,33 @@ module DocSpring
       query_params[:'include_data'] = opts[:'include_data'] if !opts[:'include_data'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'ListSubmissionsResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.list_submissions",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'ListSubmissionsResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#list_submissions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1414,43 +1998,43 @@ module DocSpring
     end
 
     # List all submissions for a given template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor 
     # @option opts [Float] :limit 
     # @option opts [String] :created_after 
     # @option opts [String] :created_before 
     # @option opts [String] :type 
-    # @option opts [BOOLEAN] :include_data 
+    # @option opts [Boolean] :include_data 
     # @return [ListSubmissionsResponse]
-    def list_submissions_0(template_id, opts = {})
-      data, _status_code, _headers = list_submissions_0_with_http_info(template_id, opts)
+    def list_template_submissions(template_id, opts = {})
+      data, _status_code, _headers = list_template_submissions_with_http_info(template_id, opts)
       data
     end
 
     # List all submissions for a given template
-    # @param template_id 
+    # @param template_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor 
     # @option opts [Float] :limit 
     # @option opts [String] :created_after 
     # @option opts [String] :created_before 
     # @option opts [String] :type 
-    # @option opts [BOOLEAN] :include_data 
-    # @return [Array<(ListSubmissionsResponse, Fixnum, Hash)>] ListSubmissionsResponse data, response status code and response headers
-    def list_submissions_0_with_http_info(template_id, opts = {})
+    # @option opts [Boolean] :include_data 
+    # @return [Array<(ListSubmissionsResponse, Integer, Hash)>] ListSubmissionsResponse data, response status code and response headers
+    def list_template_submissions_with_http_info(template_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: PDFApi.list_submissions_0 ...'
+        @api_client.config.logger.debug 'Calling API: PDFApi.list_template_submissions ...'
       end
       # verify the required parameter 'template_id' is set
       if @api_client.config.client_side_validation && template_id.nil?
-        fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.list_submissions_0"
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.list_template_submissions"
       end
       # resource path
-      local_var_path = '/templates/{template_id}/submissions'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/submissions'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
       query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
       query_params[:'created_after'] = opts[:'created_after'] if !opts[:'created_after'].nil?
@@ -1459,25 +2043,35 @@ module DocSpring
       query_params[:'include_data'] = opts[:'include_data'] if !opts[:'include_data'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'ListSubmissionsResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.list_template_submissions",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'ListSubmissionsResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PDFApi#list_submissions_0\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: PDFApi#list_template_submissions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1488,7 +2082,7 @@ module DocSpring
     # @option opts [String] :parent_folder_id Filter By Folder Id
     # @option opts [Integer] :page Default: 1
     # @option opts [Integer] :per_page Default: 50
-    # @return [Array<Template>]
+    # @return [Array<TemplatePreview>]
     def list_templates(opts = {})
       data, _status_code, _headers = list_templates_with_http_info(opts)
       data
@@ -1500,7 +2094,7 @@ module DocSpring
     # @option opts [String] :parent_folder_id Filter By Folder Id
     # @option opts [Integer] :page Default: 1
     # @option opts [Integer] :per_page Default: 50
-    # @return [Array<(Array<Template>, Fixnum, Hash)>] Array<Template> data, response status code and response headers
+    # @return [Array<(Array<TemplatePreview>, Integer, Hash)>] Array<TemplatePreview> data, response status code and response headers
     def list_templates_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.list_templates ...'
@@ -1521,30 +2115,40 @@ module DocSpring
       local_var_path = '/templates'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'query'] = opts[:'query'] if !opts[:'query'].nil?
       query_params[:'parent_folder_id'] = opts[:'parent_folder_id'] if !opts[:'parent_folder_id'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       query_params[:'per_page'] = opts[:'per_page'] if !opts[:'per_page'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<TemplatePreview>'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.list_templates",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Template>')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#list_templates\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1552,21 +2156,21 @@ module DocSpring
     end
 
     # Move a folder
-    # @param folder_id 
-    # @param move_folder_data 
+    # @param folder_id [String] 
+    # @param data [MoveFolderData] 
     # @param [Hash] opts the optional parameters
     # @return [Folder]
-    def move_folder_to_folder(folder_id, move_folder_data, opts = {})
-      data, _status_code, _headers = move_folder_to_folder_with_http_info(folder_id, move_folder_data, opts)
+    def move_folder_to_folder(folder_id, data, opts = {})
+      data, _status_code, _headers = move_folder_to_folder_with_http_info(folder_id, data, opts)
       data
     end
 
     # Move a folder
-    # @param folder_id 
-    # @param move_folder_data 
+    # @param folder_id [String] 
+    # @param data [MoveFolderData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Folder, Fixnum, Hash)>] Folder data, response status code and response headers
-    def move_folder_to_folder_with_http_info(folder_id, move_folder_data, opts = {})
+    # @return [Array<(Folder, Integer, Hash)>] Folder data, response status code and response headers
+    def move_folder_to_folder_with_http_info(folder_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.move_folder_to_folder ...'
       end
@@ -1574,36 +2178,49 @@ module DocSpring
       if @api_client.config.client_side_validation && folder_id.nil?
         fail ArgumentError, "Missing the required parameter 'folder_id' when calling PDFApi.move_folder_to_folder"
       end
-      # verify the required parameter 'move_folder_data' is set
-      if @api_client.config.client_side_validation && move_folder_data.nil?
-        fail ArgumentError, "Missing the required parameter 'move_folder_data' when calling PDFApi.move_folder_to_folder"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.move_folder_to_folder"
       end
       # resource path
-      local_var_path = '/folders/{folder_id}/move'.sub('{' + 'folder_id' + '}', folder_id.to_s)
+      local_var_path = '/folders/{folder_id}/move'.sub('{' + 'folder_id' + '}', CGI.escape(folder_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(move_folder_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Folder'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.move_folder_to_folder",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Folder')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#move_folder_to_folder\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1611,21 +2228,21 @@ module DocSpring
     end
 
     # Move Template to folder
-    # @param template_id 
-    # @param move_template_data 
+    # @param template_id [String] 
+    # @param data [MoveTemplateData] 
     # @param [Hash] opts the optional parameters
-    # @return [Template]
-    def move_template_to_folder(template_id, move_template_data, opts = {})
-      data, _status_code, _headers = move_template_to_folder_with_http_info(template_id, move_template_data, opts)
+    # @return [TemplatePreview]
+    def move_template_to_folder(template_id, data, opts = {})
+      data, _status_code, _headers = move_template_to_folder_with_http_info(template_id, data, opts)
       data
     end
 
     # Move Template to folder
-    # @param template_id 
-    # @param move_template_data 
+    # @param template_id [String] 
+    # @param data [MoveTemplateData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Template, Fixnum, Hash)>] Template data, response status code and response headers
-    def move_template_to_folder_with_http_info(template_id, move_template_data, opts = {})
+    # @return [Array<(TemplatePreview, Integer, Hash)>] TemplatePreview data, response status code and response headers
+    def move_template_to_folder_with_http_info(template_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.move_template_to_folder ...'
       end
@@ -1633,36 +2250,49 @@ module DocSpring
       if @api_client.config.client_side_validation && template_id.nil?
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.move_template_to_folder"
       end
-      # verify the required parameter 'move_template_data' is set
-      if @api_client.config.client_side_validation && move_template_data.nil?
-        fail ArgumentError, "Missing the required parameter 'move_template_data' when calling PDFApi.move_template_to_folder"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.move_template_to_folder"
       end
       # resource path
-      local_var_path = '/templates/{template_id}/move'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}/move'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(move_template_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'TemplatePreview'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.move_template_to_folder",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Template')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#move_template_to_folder\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1670,21 +2300,21 @@ module DocSpring
     end
 
     # Rename a folder
-    # @param folder_id 
-    # @param rename_folder_data 
+    # @param folder_id [String] 
+    # @param data [RenameFolderData] 
     # @param [Hash] opts the optional parameters
-    # @return [nil]
-    def rename_folder(folder_id, rename_folder_data, opts = {})
-      rename_folder_with_http_info(folder_id, rename_folder_data, opts)
-      nil
+    # @return [Folder]
+    def rename_folder(folder_id, data, opts = {})
+      data, _status_code, _headers = rename_folder_with_http_info(folder_id, data, opts)
+      data
     end
 
     # Rename a folder
-    # @param folder_id 
-    # @param rename_folder_data 
+    # @param folder_id [String] 
+    # @param data [RenameFolderData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def rename_folder_with_http_info(folder_id, rename_folder_data, opts = {})
+    # @return [Array<(Folder, Integer, Hash)>] Folder data, response status code and response headers
+    def rename_folder_with_http_info(folder_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.rename_folder ...'
       end
@@ -1692,35 +2322,49 @@ module DocSpring
       if @api_client.config.client_side_validation && folder_id.nil?
         fail ArgumentError, "Missing the required parameter 'folder_id' when calling PDFApi.rename_folder"
       end
-      # verify the required parameter 'rename_folder_data' is set
-      if @api_client.config.client_side_validation && rename_folder_data.nil?
-        fail ArgumentError, "Missing the required parameter 'rename_folder_data' when calling PDFApi.rename_folder"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.rename_folder"
       end
       # resource path
-      local_var_path = '/folders/{folder_id}/rename'.sub('{' + 'folder_id' + '}', folder_id.to_s)
+      local_var_path = '/folders/{folder_id}/rename'.sub('{' + 'folder_id' + '}', CGI.escape(folder_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(rename_folder_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Folder'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.rename_folder",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#rename_folder\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1729,7 +2373,7 @@ module DocSpring
 
     # Test Authentication
     # @param [Hash] opts the optional parameters
-    # @return [AuthenticationSuccessResponse]
+    # @return [SuccessErrorResponse]
     def test_authentication(opts = {})
       data, _status_code, _headers = test_authentication_with_http_info(opts)
       data
@@ -1737,7 +2381,7 @@ module DocSpring
 
     # Test Authentication
     # @param [Hash] opts the optional parameters
-    # @return [Array<(AuthenticationSuccessResponse, Fixnum, Hash)>] AuthenticationSuccessResponse data, response status code and response headers
+    # @return [Array<(SuccessErrorResponse, Integer, Hash)>] SuccessErrorResponse data, response status code and response headers
     def test_authentication_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.test_authentication ...'
@@ -1746,26 +2390,36 @@ module DocSpring
       local_var_path = '/authentication'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SuccessErrorResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.test_authentication",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'AuthenticationSuccessResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#test_authentication\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1773,21 +2427,21 @@ module DocSpring
     end
 
     # Update a submission data request
-    # @param data_request_id 
-    # @param update_submission_data_request_data 
+    # @param data_request_id [String] 
+    # @param data [UpdateSubmissionDataRequestData] 
     # @param [Hash] opts the optional parameters
-    # @return [UpdateDataRequestResponse]
-    def update_data_request(data_request_id, update_submission_data_request_data, opts = {})
-      data, _status_code, _headers = update_data_request_with_http_info(data_request_id, update_submission_data_request_data, opts)
+    # @return [CreateSubmissionDataRequestResponse]
+    def update_data_request(data_request_id, data, opts = {})
+      data, _status_code, _headers = update_data_request_with_http_info(data_request_id, data, opts)
       data
     end
 
     # Update a submission data request
-    # @param data_request_id 
-    # @param update_submission_data_request_data 
+    # @param data_request_id [String] 
+    # @param data [UpdateSubmissionDataRequestData] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(UpdateDataRequestResponse, Fixnum, Hash)>] UpdateDataRequestResponse data, response status code and response headers
-    def update_data_request_with_http_info(data_request_id, update_submission_data_request_data, opts = {})
+    # @return [Array<(CreateSubmissionDataRequestResponse, Integer, Hash)>] CreateSubmissionDataRequestResponse data, response status code and response headers
+    def update_data_request_with_http_info(data_request_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.update_data_request ...'
       end
@@ -1795,36 +2449,49 @@ module DocSpring
       if @api_client.config.client_side_validation && data_request_id.nil?
         fail ArgumentError, "Missing the required parameter 'data_request_id' when calling PDFApi.update_data_request"
       end
-      # verify the required parameter 'update_submission_data_request_data' is set
-      if @api_client.config.client_side_validation && update_submission_data_request_data.nil?
-        fail ArgumentError, "Missing the required parameter 'update_submission_data_request_data' when calling PDFApi.update_data_request"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.update_data_request"
       end
       # resource path
-      local_var_path = '/data_requests/{data_request_id}'.sub('{' + 'data_request_id' + '}', data_request_id.to_s)
+      local_var_path = '/data_requests/{data_request_id}'.sub('{' + 'data_request_id' + '}', CGI.escape(data_request_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(update_submission_data_request_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CreateSubmissionDataRequestResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.update_data_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'UpdateDataRequestResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#update_data_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1832,21 +2499,21 @@ module DocSpring
     end
 
     # Update a Template
-    # @param template_id 
-    # @param update_template_data 
+    # @param template_id [String] 
+    # @param data [UpdateHtmlTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [UpdateTemplateResponse]
-    def update_template(template_id, update_template_data, opts = {})
-      data, _status_code, _headers = update_template_with_http_info(template_id, update_template_data, opts)
+    # @return [SuccessMultipleErrorsResponse]
+    def update_template(template_id, data, opts = {})
+      data, _status_code, _headers = update_template_with_http_info(template_id, data, opts)
       data
     end
 
     # Update a Template
-    # @param template_id 
-    # @param update_template_data 
+    # @param template_id [String] 
+    # @param data [UpdateHtmlTemplate] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(UpdateTemplateResponse, Fixnum, Hash)>] UpdateTemplateResponse data, response status code and response headers
-    def update_template_with_http_info(template_id, update_template_data, opts = {})
+    # @return [Array<(SuccessMultipleErrorsResponse, Integer, Hash)>] SuccessMultipleErrorsResponse data, response status code and response headers
+    def update_template_with_http_info(template_id, data, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: PDFApi.update_template ...'
       end
@@ -1854,41 +2521,53 @@ module DocSpring
       if @api_client.config.client_side_validation && template_id.nil?
         fail ArgumentError, "Missing the required parameter 'template_id' when calling PDFApi.update_template"
       end
-      # verify the required parameter 'update_template_data' is set
-      if @api_client.config.client_side_validation && update_template_data.nil?
-        fail ArgumentError, "Missing the required parameter 'update_template_data' when calling PDFApi.update_template"
+      # verify the required parameter 'data' is set
+      if @api_client.config.client_side_validation && data.nil?
+        fail ArgumentError, "Missing the required parameter 'data' when calling PDFApi.update_template"
       end
       # resource path
-      local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', template_id.to_s)
+      local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(update_template_data)
-      auth_names = ['api_token_basic']
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(data)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'SuccessMultipleErrorsResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['api_token_basic']
+
+      new_options = opts.merge(
+        :operation => :"PDFApi.update_template",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'UpdateTemplateResponse')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PDFApi#update_template\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
-
   end
 end