diff --git a/articles/fleet-4.40.0.md b/articles/fleet-4.40.0.md
index c4db614cc6..a532533165 100644
--- a/articles/fleet-4.40.0.md
+++ b/articles/fleet-4.40.0.md
@@ -1,4 +1,4 @@
-# Fleet 4.40.0 | Rapid Security Response, CIS Benchmark updates.
+# Fleet 4.40.0 | More Data, Rapid Security Response, CIS Benchmark updates.

@@ -7,12 +7,12 @@ For upgrade instructions, see our [upgrade guide](https://fleetdm.com/docs/deplo
## Highlights
-
+* More osquery tables
* RSR version in host details
* CIS Benchmarks for Windows 10 updates
-
### RSR version in host details
@@ -109,5 +108,5 @@ Visit our [Upgrade guide](https://fleetdm.com/docs/deploying/upgrading-fleet) in
-
+
diff --git a/schema/tables/app_icons.yml b/schema/tables/app_icons.yml
new file mode 100644
index 0000000000..be2163c090
--- /dev/null
+++ b/schema/tables/app_icons.yml
@@ -0,0 +1,19 @@
+name: app_icons
+description: Icons and their locations for macOS applications.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: path
+ description: The icon's path.
+ type: text
+ required: false
+ - name: icon
+ description: The icon.
+ type: text
+ required: false
+ - name: hash
+ description: The icon's hash.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/cryptoinfo.yml b/schema/tables/cryptoinfo.yml
new file mode 100644
index 0000000000..4fd8d5da37
--- /dev/null
+++ b/schema/tables/cryptoinfo.yml
@@ -0,0 +1,37 @@
+name: cryptoinfo
+description: Get info about the a certificate on the host.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+ - windows
+ - linux
+columns:
+ - name: path
+ description: Path to the certificate.
+ type: text
+ required: true
+ - name: passphrase
+ description: The passphrase for the certificate.
+ type: text
+ required: false
+ - name: key
+ description: A specific item that describes the drive.
+ type: text
+ required: false
+ - name: value
+ description: The value for the specified key.
+ type: text
+ required: false
+ - name: fullkey
+ description: The expanded name of the specific item that describes the drive.
+ type: text
+ required: false
+ - name: parent
+ description: The key's parent.
+ type: text
+ required: false
+ - name: query
+ description: The query is printed in this column. For example the SQL `SELECT * FROM cryuptsetup_status WHERE name = 'LUKS_DRIVE' will print "*"` in the query column.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/cryptsetup_status.yml b/schema/tables/cryptsetup_status.yml
new file mode 100644
index 0000000000..91ca6ab99a
--- /dev/null
+++ b/schema/tables/cryptsetup_status.yml
@@ -0,0 +1,31 @@
+name: cryptsetup_status
+description: Get info about the encrypted drive on the host.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - linux
+columns:
+ - name: name
+ required: true
+ description: The name of the drive.
+ type: text
+ - name: key
+ description: A specific item that describes the drive.
+ type: text
+ required: false
+ - name: value
+ description: The value for the specified key.
+ type: text
+ required: false
+ - name: fullkey
+ description: The expanded name of the specific item that describes the drive.
+ type: text
+ required: false
+ - name: parent
+ description: The key's parent.
+ type: text
+ required: false
+ - name: query
+ description: The query is printed in this column. For example the SQL `SELECT * FROM cryuptsetup_status WHERE name = 'LUKS_DRIVE'` will print "*" in the query column.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/falcon_kernel_check.yml b/schema/tables/falcon_kernel_check.yml
new file mode 100644
index 0000000000..9e9beb0cd2
--- /dev/null
+++ b/schema/tables/falcon_kernel_check.yml
@@ -0,0 +1,19 @@
+name: falcon_kernel_check
+description: Get information about Crowdstrike Falcon agent installed on the host.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - linux
+columns:
+ - name: kernel
+ description: Version of the host's kernel.
+ type: text
+ required: false
+ - name: supported
+ description: Whether or not the host's kernel supports the Crowdstrike Falcon sensor version.
+ type: text
+ required: false
+ - name: sensor_version
+ description: Version of the Crowdstrike Falcon's sensor.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/falconctl_options.yml b/schema/tables/falconctl_options.yml
new file mode 100644
index 0000000000..9e839c82eb
--- /dev/null
+++ b/schema/tables/falconctl_options.yml
@@ -0,0 +1,11 @@
+name: falconctl_options
+description: Get information about Crowdstrike Falcon agent installed on the host.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - linux
+columns:
+ - name: options
+ description: "The falconctol options to run. Supported values are listed here: `--aid`, `--apd`,`--aph`, `--app`, `--cid`, `--feature`, `--metadata-query`, `--rfm-reason`,`--rfm-state`, `--tags`, `--version`"
+ type: text
+ required: true
\ No newline at end of file
diff --git a/schema/tables/filevault_status.yml b/schema/tables/filevault_status.yml
new file mode 100644
index 0000000000..29a5fe26fd
--- /dev/null
+++ b/schema/tables/filevault_status.yml
@@ -0,0 +1,11 @@
+name: filevault_status
+description: Get current FileVault status.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: status
+ description: FileVault status.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/firefox_preferences.yml b/schema/tables/firefox_preferences.yml
new file mode 100644
index 0000000000..f83bf45ea3
--- /dev/null
+++ b/schema/tables/firefox_preferences.yml
@@ -0,0 +1,32 @@
+name: firefox_preferences
+description: Get the filepath where the host's Firefox preferences live.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: path
+ description: The path to the host's Firefox preferences.
+ type: text
+ required: true
+ - name: key
+ description: A specific item that describes the path.
+ type: text
+ required: false
+ - name: value
+ description: The value for the specified key.
+ type: text
+ required: false
+ - name: fullkey
+ description: The expanded name of the specific item that describes the path.
+ type: text
+ required: false
+ - name: parent
+ description: The key's parent.
+ type: text
+ required: false
+ - name: query
+ description: The query is printed in this column. For example the SQL `SELECT * FROM firefox_preferences WHERE path = 'testdata/prefs.js'` will print "*" in the query column.
+ type: text
+ required: false
+
\ No newline at end of file
diff --git a/schema/tables/firmwarepasswd.yml b/schema/tables/firmwarepasswd.yml
new file mode 100644
index 0000000000..4556cccd2c
--- /dev/null
+++ b/schema/tables/firmwarepasswd.yml
@@ -0,0 +1,19 @@
+name: firmwarepasswd
+description: "Information on the device's firmware password. Supported on Intel macOS hosts only. Reference: https://support.apple.com/en-us/HT204455"
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: option_roms_allowed
+ description: Whether or not option ROMs are allowed.
+ required: false
+ type: text
+ - name: password_enabled
+ description: Whether or not the host has a firmware password.
+ required: false
+ type: text
+ - name: mode
+ description: Host's mode setting.
+ required: false
+ type: text
\ No newline at end of file
diff --git a/schema/tables/ioreg.yml b/schema/tables/ioreg.yml
new file mode 100644
index 0000000000..727749f0f0
--- /dev/null
+++ b/schema/tables/ioreg.yml
@@ -0,0 +1,51 @@
+name: ioreg
+description: Get values from macOS ioreg command. Columns are input options for the command. They match the ioreg command line tool.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: c
+ description: List properties of objects with the given class.
+ required: false
+ type: text
+ - name: d
+ description: Limit tree to the given depth.
+ required: false
+ type: text
+ - name: k
+ description: List properties of objects with the given key.
+ required: false
+ type: text
+ - name: "n"
+ description: List properties of objects with the given name.
+ required: false
+ type: text
+ - name: p
+ description: Traverse registry over the given plane (IOService is default).
+ required: false
+ type: text
+ - name: r
+ description: Show subtrees rooted by the given criteria.
+ required: false
+ type: text
+ - name: key
+ description: A specific item that describes the returned value.
+ type: text
+ required: false
+ - name: value
+ description: The value for the specified key.
+ type: text
+ required: false
+ - name: fullkey
+ description: The expanded name of the specific item that describes the value.
+ type: text
+ required: false
+ - name: parent
+ description: The key's parent.
+ type: text
+ required: false
+ - name: query
+ description: The query is printed in this column.
+ type: text
+ required: false
\ No newline at end of file
diff --git a/schema/tables/windows_updates.yml b/schema/tables/windows_updates.yml
new file mode 100644
index 0000000000..a56c51290f
--- /dev/null
+++ b/schema/tables/windows_updates.yml
@@ -0,0 +1,35 @@
+name: windows_updates
+description: Returns information about Windows updates that are available for installation.
+evented: false
+notes: This table is not a core osquery table. It is included as part of fleetd, the osquery manager from Fleet. Code based on work by [Kolide](https://github.com/kolide/launcher).
+platforms:
+ - darwin
+columns:
+ - name: locale
+ description: Location of the update.
+ required: false
+ type: text
+ - name: is_default
+ description: Whether or not the update is the default.
+ required: false
+ type: text
+ - name: key
+ description: A specific item that describes the update.
+ type: text
+ required: false
+ - name: value
+ description: The value for the specified key.
+ type: text
+ required: false
+ - name: fullkey
+ description: The expanded name of the specific item that describes the update.
+ type: text
+ required: false
+ - name: parent
+ description: The key's parent.
+ type: text
+ required: false
+ - name: query
+ description: The query is printed in this column.
+ type: text
+ required: false
\ No newline at end of file