diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f827719..d8e76d9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+## 1.9.7.1
+- Add `Get-B1Compartment` for listing Organizational Compartments
+- Add support for configuring Organizational Compartments when using:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `New-B1AuthoritativeZone`  | `New-B1AddressBlock`       | `New-B1Space`              |
+| `Set-B1AuthoritativeZone`  | `Set-B1AddressBlock`       |                            |
+
+- Add support for filtering by Organizational Compartment when using:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `Get-B1Subnet`             | `Get-B1AddressBlock`       | `Get-B1Range`              |
+| `Get-B1AuthoritativeZone`  | `Get-B1ForwardZone`        | `Get-B1Record`             |
+| `Get-B1Address`            | `Get-B1Space`              |                            |
+
+- Add/Align `-CustomFilters` support to:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `Get-B1AuthoriativeNSG`    | `Get-B1AuthoriativeZone`   | `Get-B1CloudProvider`      |
+| `Get-B1DelegatedZone`      | `Get-B1DFP`                | `Get-B1DHCPConfigProfile`  |
+| `Get-B1DHCPHardwareFilter` | `Get-B1DHCPHost`           | `Get-B1DHCPLease`          |
+| `Get-B1DHCPOptionCode`     | `Get-B1DHCPOptionGroup`    | `Get-B1DHCPOptionSpace`    |
+| `Get-B1DNSACL`             | `Get-B1DNSConfigProfile`   | `Get-B1DNSHost`            |
+| `Get-B1DNSView`            | `Get-B1DTCHealthCheck`     | `Get-B1DTCLBDN`            |
+| `Get-B1DTCPolicy`          | `Get-B1DTCPool`            | `Get-B1DTCServer`          |
+| `Get-B1FixedAddress`       | `Get-B1ForwardNSG`         | `Get-B1ForwardZone`        |
+| `Get-B1HAGroup`            | `Get-B1Range`              | `Get-B1Record`             |
+| `Get-B1Space`              | `Get-B1Subnet`             | `Get-B1Address`            |
+| `Get-B1AddressBlock`       | `Get-B1AuditLog`           | `Get-B1APIKey`             |
+| `Get-B1DNSEvent`           | `Get-B1Location`           | `Get-B1SecurityLog`        |
+| `Get-B1Tag`                | `Get-B1User`               | `Get-B1UserAPIKey`         |
+| `Get-B1Host`               | `Get-B1Service`            | `Get-B1ApplicationFilter`  |
+| `Get-B1BypassCode`         | `Get-B1CategoryFilter`     | `Get-B1CustomList`         |
+| `Get-B1InternalDomainList` | `Get-B1LookalikeDomains`   | `Get-B1Lookalikes`         |
+| `Get-B1NetworkList`        | `Get-B1PoPRegion`          | `Get-B1SecurityPolicy`     |
+| `Get-B1SecurityPolicyRules`| `Get-B1ThirdPartyProvider` |                            |
+
 ## 1.9.7.0
 - Add new `Resolve-DoHQuery` function to enable querying DNS over HTTPS endpoints
 - Add new `-DoHServer` parameter to `Set-ibPSConfiguration` to set persistent DoH Server URL
@@ -306,3 +346,4 @@
 
 
 
+
diff --git a/Modules/ibPS/Functions/Misc/build.json b/Modules/ibPS/Functions/Misc/build.json
index 76745092..c37c6eb7 100644
--- a/Modules/ibPS/Functions/Misc/build.json
+++ b/Modules/ibPS/Functions/Misc/build.json
@@ -1,5 +1,5 @@
 {
-  "Build": 14,
-  "SHA": "5ae0bf699a406331acb0e7162a0a2c81f9f388dc",
-  "Branch": "dev"
+  "Build": "0",
+  "SHA": "23cea78d6c4a812ce21325b0899b05c61ce71d2a",
+  "Branch": "main"
 }
diff --git a/Modules/ibPS/ibPS.psd1 b/Modules/ibPS/ibPS.psd1
index f5b88994..ffd81926 100644
--- a/Modules/ibPS/ibPS.psd1
+++ b/Modules/ibPS/ibPS.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Mat Cox
 #
-# Generated on: 06/11/2024
+# Generated on: 06/12/2024
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'BloxOne-Main.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.9.7.0'
+ModuleVersion = '1.9.7.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/docs/Change Log.md b/docs/Change Log.md
index 5f827719..d8e76d9c 100644
--- a/docs/Change Log.md	
+++ b/docs/Change Log.md	
@@ -1,3 +1,43 @@
+## 1.9.7.1
+- Add `Get-B1Compartment` for listing Organizational Compartments
+- Add support for configuring Organizational Compartments when using:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `New-B1AuthoritativeZone`  | `New-B1AddressBlock`       | `New-B1Space`              |
+| `Set-B1AuthoritativeZone`  | `Set-B1AddressBlock`       |                            |
+
+- Add support for filtering by Organizational Compartment when using:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `Get-B1Subnet`             | `Get-B1AddressBlock`       | `Get-B1Range`              |
+| `Get-B1AuthoritativeZone`  | `Get-B1ForwardZone`        | `Get-B1Record`             |
+| `Get-B1Address`            | `Get-B1Space`              |                            |
+
+- Add/Align `-CustomFilters` support to:
+
+|                            |                            |                            |
+|:---------------------------|:---------------------------|:---------------------------|
+| `Get-B1AuthoriativeNSG`    | `Get-B1AuthoriativeZone`   | `Get-B1CloudProvider`      |
+| `Get-B1DelegatedZone`      | `Get-B1DFP`                | `Get-B1DHCPConfigProfile`  |
+| `Get-B1DHCPHardwareFilter` | `Get-B1DHCPHost`           | `Get-B1DHCPLease`          |
+| `Get-B1DHCPOptionCode`     | `Get-B1DHCPOptionGroup`    | `Get-B1DHCPOptionSpace`    |
+| `Get-B1DNSACL`             | `Get-B1DNSConfigProfile`   | `Get-B1DNSHost`            |
+| `Get-B1DNSView`            | `Get-B1DTCHealthCheck`     | `Get-B1DTCLBDN`            |
+| `Get-B1DTCPolicy`          | `Get-B1DTCPool`            | `Get-B1DTCServer`          |
+| `Get-B1FixedAddress`       | `Get-B1ForwardNSG`         | `Get-B1ForwardZone`        |
+| `Get-B1HAGroup`            | `Get-B1Range`              | `Get-B1Record`             |
+| `Get-B1Space`              | `Get-B1Subnet`             | `Get-B1Address`            |
+| `Get-B1AddressBlock`       | `Get-B1AuditLog`           | `Get-B1APIKey`             |
+| `Get-B1DNSEvent`           | `Get-B1Location`           | `Get-B1SecurityLog`        |
+| `Get-B1Tag`                | `Get-B1User`               | `Get-B1UserAPIKey`         |
+| `Get-B1Host`               | `Get-B1Service`            | `Get-B1ApplicationFilter`  |
+| `Get-B1BypassCode`         | `Get-B1CategoryFilter`     | `Get-B1CustomList`         |
+| `Get-B1InternalDomainList` | `Get-B1LookalikeDomains`   | `Get-B1Lookalikes`         |
+| `Get-B1NetworkList`        | `Get-B1PoPRegion`          | `Get-B1SecurityPolicy`     |
+| `Get-B1SecurityPolicyRules`| `Get-B1ThirdPartyProvider` |                            |
+
 ## 1.9.7.0
 - Add new `Resolve-DoHQuery` function to enable querying DNS over HTTPS endpoints
 - Add new `-DoHServer` parameter to `Set-ibPSConfiguration` to set persistent DoH Server URL
@@ -306,3 +346,4 @@
 
 
 
+
diff --git a/docs/manifest.json b/docs/manifest.json
index 0f990449..8f9bbadb 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1,6 +1,6 @@
 {
   "Name": "ibPS",
-  "Version": "1.9.7.0",
+  "Version": "1.9.7.1",
   "Description": "InfoBlox BloxOne PowerShell Module",
   "Author": "Mat Cox",
   "ProjectUri": "https://github.com/TehMuffinMoo/ibPS",