diff --git a/Cargo.lock b/Cargo.lock
index 2d8d7c165..0cdf0dced 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#cb5f06c747e45f54bc839c4aeea7fed9d49967df"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f"
 dependencies = [
  "zerocopy",
 ]
diff --git a/devices/src/acpi.rs b/devices/src/acpi.rs
index 81c55d994..eda6b61be 100644
--- a/devices/src/acpi.rs
+++ b/devices/src/acpi.rs
@@ -116,6 +116,7 @@ impl Aml for AcpiGedDevice {
                         true,
                         self.address.0,
                         self.address.0 + GED_DEVICE_ACPI_SIZE as u64 - 1,
+                        None,
                     )]),
                 ),
                 &aml::OpRegion::new(
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index a35f15b77..0bc34ad37 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f"
 dependencies = [
  "zerocopy",
 ]
diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs
index 2fbb276b0..08cfdc9d9 100644
--- a/vmm/src/cpu.rs
+++ b/vmm/src/cpu.rs
@@ -1987,6 +1987,7 @@ impl Aml for CpuManager {
                             true,
                             acpi_address.0,
                             acpi_address.0 + CPU_MANAGER_ACPI_SIZE as u64 - 1,
+                            None,
                         )]),
                     ),
                     // OpRegion and Fields map MMIO range into individual field values
diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index 3611e9af0..4ba4ff8b4 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -4302,6 +4302,7 @@ impl Aml for DeviceManager {
                         true,
                         self.acpi_address.0,
                         self.acpi_address.0 + DEVICE_MANAGER_ACPI_SIZE as u64 - 1,
+                        None,
                     )]),
                 ),
                 // OpRegion and Fields map MMIO range into individual field values
diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index 0776f702e..e0f0f800b 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -2244,6 +2244,7 @@ impl Aml for MemoryMethods {
                         true,
                         0x0000_0000_0000_0000u64,
                         0xFFFF_FFFF_FFFF_FFFEu64,
+                        None,
                     )]),
                 ),
                 &aml::CreateQWordField::new(
@@ -2326,6 +2327,7 @@ impl Aml for MemoryManager {
                             true,
                             acpi_address.0,
                             acpi_address.0 + MEMORY_MANAGER_ACPI_SIZE as u64 - 1,
+                            None,
                         )]),
                     ),
                     // OpRegion and Fields map MMIO range into individual field values
@@ -2421,6 +2423,7 @@ impl Aml for MemoryManager {
                                 true,
                                 min,
                                 max,
+                                None,
                             )]),
                         ),
                         &aml::Method::new("_STA".into(), 0, false, vec![&aml::Return::new(&0xfu8)]),
diff --git a/vmm/src/pci_segment.rs b/vmm/src/pci_segment.rs
index dd1b3f90a..570b55f56 100644
--- a/vmm/src/pci_segment.rs
+++ b/vmm/src/pci_segment.rs
@@ -353,17 +353,19 @@ impl Aml for PciSegment {
                         layout::MEM_32BIT_DEVICES_START.0 as u32,
                         (layout::MEM_32BIT_DEVICES_START.0 + layout::MEM_32BIT_DEVICES_SIZE - 1)
                             as u32,
+                        None,
                     ),
                     &aml::AddressSpace::new_memory(
                         aml::AddressSpaceCachable::NotCacheable,
                         true,
                         self.start_of_device_area,
                         self.end_of_device_area,
+                        None,
                     ),
                     #[cfg(target_arch = "x86_64")]
-                    &aml::AddressSpace::new_io(0u16, 0x0cf7u16),
+                    &aml::AddressSpace::new_io(0u16, 0x0cf7u16, None),
                     #[cfg(target_arch = "x86_64")]
-                    &aml::AddressSpace::new_io(0x0d00u16, 0xffffu16),
+                    &aml::AddressSpace::new_io(0x0d00u16, 0xffffu16, None),
                 ]),
             )
         } else {
@@ -381,6 +383,7 @@ impl Aml for PciSegment {
                         true,
                         self.start_of_device_area,
                         self.end_of_device_area,
+                        None,
                     ),
                 ]),
             )