diff --git a/asset-managment/niapm.yml b/asset-managment/niapm.yml
index 64927c9..fbcd7f9 100644
--- a/asset-managment/niapm.yml
+++ b/asset-managment/niapm.yml
@@ -530,6 +530,14 @@ definitions:
             items:
                 type: string
                 example: '608a5684800e325b48837c2a'
+          supportsSelfTest:
+            description: Whether the asset supports self-test.
+            type: boolean
+            example: true
+          supportsReset:
+            description: Whether the asset supports reset.
+            type: boolean
+            example: true
   AssetCreateModel:
     title: Asset Create Model
     description: >-
diff --git a/auth/niauth.yaml b/auth/niauth.yaml
index fe42e22..43a1cd2 100644
--- a/auth/niauth.yaml
+++ b/auth/niauth.yaml
@@ -12,8 +12,11 @@ securityDefinitions:
     type: apiKey
     name: x-ni-api-key
     in: header
+  BasicAuth:
+    type: basic
 security:
   - ApiKeyAuth: []
+  - BasicAuth: []
 paths:
   /auth:
     get:
diff --git a/file/nifile.yml b/file/nifile.yml
index 9267adb..a0bc51f 100644
--- a/file/nifile.yml
+++ b/file/nifile.yml
@@ -155,6 +155,11 @@ definitions:
         description: The workspace the file belongs to
         type: string
         example: MyWorkspace
+      lastUpdatedTimestamp:
+        description: The date and time the file was last updated in the file service
+        type: string
+        format: date-time
+        example: '2018-05-15T18:54:27.519Z'
   ServiceGroup:
     type: object
     properties:
@@ -571,6 +576,7 @@ paths:
             - created
             - id
             - size
+            - lastUpdatedTimestamp
         - in: query
           name: orderByDescending
           description: >-
diff --git a/systems-management/nisysmgmt.yml b/systems-management/nisysmgmt.yml
index c0c1dbe..6d22a51 100644
--- a/systems-management/nisysmgmt.yml
+++ b/systems-management/nisysmgmt.yml
@@ -1122,6 +1122,13 @@ definitions:
         type: string
         description: The ID of the workspace.
         example: '5bc5e9092a4fa4c71cfa7197'
+      properties:
+        type: object
+        description: The new properties (key-value pairs).
+        additionalProperties:
+          type: string
+        example:
+          owner: admin
       
   QueryAvailablePackagesRequest:
     title: Get Available Packages Request
@@ -1435,7 +1442,7 @@ definitions:
             $ref: '#/definitions/Operation'
 
   QuerySystemsRequest:
-    description: Request for querying resources. More info here -> https://github.com/StefH/System.Linq.Dynamic.Core/wiki/Dynamic-Expressions and https://stefh.github.io/System.Linq.Dynamic.Core/html/144078bd-d1ad-bece-4daa-7fdd3a7ed7dc.htm
+    description: Request for querying systems resources. Dynamic LINQ is used for query syntax. More info can be found at https://dynamic-linq.net
     title: Query Systems Request
     properties:
       skip:
@@ -1551,7 +1558,7 @@ definitions:
         description: The order in which data returns.
 
   QueryJobsRequest:
-    description: Request for querying jobs resources. More info here -> https://github.com/StefH/System.Linq.Dynamic.Core/wiki/Dynamic-Expressions and https://stefh.github.io/System.Linq.Dynamic.Core/html/144078bd-d1ad-bece-4daa-7fdd3a7ed7dc.htm
+    description: Request for querying jobs resources. Dynamic LINQ is used for query syntax. More info can be found at https://dynamic-linq.net
     title: Query Jobs Request
     properties:
       skip:
diff --git a/test-monitor/nitestmonitor-v2.yml b/test-monitor/nitestmonitor-v2.yml
index 611ced4..d2c7a1c 100644
--- a/test-monitor/nitestmonitor-v2.yml
+++ b/test-monitor/nitestmonitor-v2.yml
@@ -431,6 +431,7 @@ definitions:
   TestResultRequestObject:
     title: Test Result Request
     type: object
+    required: [programName, status]
     properties:
       programName:
         description: Program name
@@ -738,6 +739,9 @@ definitions:
           myMeasurement: {}
   ProductsAdvancedQuery:
     title: Advanced Query Object for Products
+    description: >-
+      Product fields that the response can be ordered by are 
+      `ID`, `PART_NUMBER`, `NAME`, `FAMILY`, and `UPDATED_AT`.
     type: object
     properties:
       filter:
@@ -798,6 +802,9 @@ definitions:
         example: false
   PathsAdvancedQuery:
     title: Advanced Query Object for Paths
+    description: >-
+      Path fields that the response can be ordered by are 
+      `ID`, `PROGRAM_NAME`, `PART_NUMBER`, and `PATH`.
     type: object
     properties:
       filter:
@@ -858,6 +865,11 @@ definitions:
         example: false
   ResultsAdvancedQuery:
     title: Advanced Query Object for Test Results
+    description: >-
+      Test Result fields that the response can be ordered by are
+      `ID`, `STARTED_AT`, `UPDATED_AT`, `PROGRAM_NAME`, `SYSTEM_ID`, 
+      `HOST_NAME`, `OPERATOR`, `SERIAL_NUMBER`, `PART_NUMBER`, 
+      and `TOTAL_TIME_IN_SECONDS`.
     type: object
     properties:
       filter:
@@ -936,12 +948,17 @@ definitions:
         $ref: '#/definitions/ResponseFormat'
   StepsAdvancedQuery:
     title: Advanced Query Object for Test Steps
+    description: >-
+      Test Step fields that the response can be ordered by are 
+      `NAME`, `STEP_TYPE`, `STEP_ID`, `PARENT_ID`, `RESULT_ID`, 
+      `PATH`, `TOTAL_TIME_IN_SECONDS`, `STARTED_AT`, `UPDATED_AT`,
+      and `DATA_MODEL`.
     type: object
     properties:
       filter:
         description: The step query filter in Dynamic Linq
         type: string
-        example: (operator == "user1") || ((programName != "MyProgram") && (totalTimeInSeconds < @0))
+        example: (stepType == "NumericLimitTest") && (totalTimeInSeconds > @0)
       substitutions:
         description: >-
           Makes substitutions in the query filter expression. Substitutions for the query expression
@@ -2077,7 +2094,7 @@ paths:
         Queries known values for an indexed, scalar result field. Supported
         fields are `ID`, `STARTED_AT`, `UPDATED_AT`, `PROGRAM_NAME`,
         `SYSTEM_ID`, `HOST_NAME`, `OPERATOR`, `SERIAL_NUMBER`, `PART_NUMBER`,
-        `TOTAL_TIME_IN_SECONDS`, and `WORKSPACE`.
+        and `TOTAL_TIME_IN_SECONDS`.
       operationId: query-result-values-v2
       x-ni-operation: queryResults
       x-ni-auth: true
@@ -2311,8 +2328,8 @@ paths:
       description: >-
         Queries known values for an indexed, scalar step field. Supported
         fields are `NAME`, `STEP_TYPE`, `STEP_ID`, `PARENT_ID`, `RESULT_ID`,
-        `PATH`, `TOTAL_TIME_IN_SECONDS`, `STARTED_AT`, `UPDATED_AT`,
-        `DATA_MODEL`, and `WORKSPACE`.
+        `PATH`, `TOTAL_TIME_IN_SECONDS`, `STARTED_AT`, `UPDATED_AT`, and
+        `DATA_MODEL`.
       operationId: query-step-values-v2
       x-ni-operation: querySteps
       x-ni-auth: true
diff --git a/user/niuser.yaml b/user/niuser.yaml
index 04f1447..9e0ebb2 100644
--- a/user/niuser.yaml
+++ b/user/niuser.yaml
@@ -12,8 +12,11 @@ securityDefinitions:
     type: apiKey
     name: x-ni-api-key
     in: header
+  BasicAuth:
+    type: basic
 security:
   - ApiKeyAuth: []
+  - BasicAuth: []
 paths:
   '/users/query':
     post:
diff --git a/webapp/niapp.yaml b/webapp/niapp.yaml
index 36a7768..3d810a8 100644
--- a/webapp/niapp.yaml
+++ b/webapp/niapp.yaml
@@ -12,8 +12,11 @@ securityDefinitions:
     type: apiKey
     name: x-ni-api-key
     in: header
+  BasicAuth:
+    type: basic
 security:
   - ApiKeyAuth: []
+  - BasicAuth: []
 paths:
   '/webapps/{id}':
     get: