diff --git a/iosxe_system.tf b/iosxe_system.tf
index b2a02c5..15097ae 100644
--- a/iosxe_system.tf
+++ b/iosxe_system.tf
@@ -9,6 +9,8 @@ resource "iosxe_system" "system" {
   mtu                              = try(local.device_config[each.value.name].system.mtu, local.defaults.iosxe.configuration.system.mtu, null)
   ip_source_route                  = try(local.device_config[each.value.name].system.ip_source_route, local.defaults.iosxe.configuration.system.ip_source_route, null)
   ip_domain_lookup                 = try(local.device_config[each.value.name].system.ip_domain_lookup, local.defaults.iosxe.configuration.system.ip_domain_lookup, null)
+  ip_domain_lookup_nsap            = try(local.device_config[each.value.name].system.ip_domain_lookup_nsap, local.defaults.iosxe.configuration.system.ip_domain_lookup_nsap, null)
+  ip_domain_lookup_recursive       = try(local.device_config[each.value.name].system.ip_domain_lookup_recursive, local.defaults.iosxe.configuration.system.ip_domain_lookup_recursive, null)
   ip_domain_name                   = try(local.device_config[each.value.name].system.ip_domain_name, local.defaults.iosxe.configuration.system.ip_domain_name, null)
   login_delay                      = try(local.device_config[each.value.name].system.login_delay, local.defaults.iosxe.configuration.system.login_delay, null)
   login_on_failure                 = try(local.device_config[each.value.name].system.login_on_failure, local.defaults.iosxe.configuration.system.login_on_failure, null)
@@ -56,6 +58,21 @@ resource "iosxe_system" "system" {
   ip_domain_lookup_source_interface_two_gigabit_ethernet         = try(local.device_config[each.value.name].system.ip_domain_lookup_source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_source_interface_type, null) == "TwoGigabitEthernet" ? try(trimprefix(local.device_config[each.value.name].system.ip_domain_lookup_source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_source_interface_id, null) : null
   ip_domain_lookup_source_interface_vlan                         = try(local.device_config[each.value.name].system.ip_domain_lookup_source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_source_interface_type, null) == "Vlan" ? try(local.device_config[each.value.name].system.ip_domain_lookup_source_interface_id, local.defaults.iosxe.configuration.system.ip_domain_lookup_source_interface_id, null) : null
 
+  ip_domain_lookup_vrfs = try(length(local.device_config[each.value.name].system.ip_domain_lookup_vrfs) == 0, true) ? null : [
+    for vrf in local.device_config[each.value.name].system.ip_domain_lookup_vrfs : {
+      vrf                                           = try(vrf.vrf, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.vrf, null)
+      source_interface_five_gigabit_ethernet        = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "FiveGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_forty_gigabit_ethernet       = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "FortyGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_gigabit_ethernet             = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "GigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_hundred_gigabit_ethernet     = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "HundredGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_loopback                     = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "Loopback" ? try(vrf.source_interface_id, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_ten_gigabit_ethernet         = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "TenGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_twenty_five_gigabit_ethernet = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "TwentyFiveGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_two_gigabit_ethernet         = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "TwoGigabitEthernet" ? try(trimprefix(vrf.source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+      source_interface_vlan                         = try(vrf.source_interface_type, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_type, null) == "Vlan" ? try(vrf.source_interface_id, local.defaults.iosxe.configuration.system.ip_domain_lookup_vrfs.source_interface_id, null) : null
+    }
+  ]
+
   ip_radius_source_interface_five_gigabit_ethernet        = try(local.device_config[each.value.name].system.ip_radius_source_interface_type, local.defaults.iosxe.configuration.system.ip_radius_source_interface_type, null) == "FiveGigabitEthernet" ? try(trimprefix(local.device_config[each.value.name].system.ip_radius_source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_radius_source_interface_id, null) : null
   ip_radius_source_interface_forty_gigabit_ethernet       = try(local.device_config[each.value.name].system.ip_radius_source_interface_type, local.defaults.iosxe.configuration.system.ip_radius_source_interface_type, null) == "FortyGigabitEthernet" ? try(trimprefix(local.device_config[each.value.name].system.ip_radius_source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_radius_source_interface_id, null) : null
   ip_radius_source_interface_gigabit_ethernet             = try(local.device_config[each.value.name].system.ip_radius_source_interface_type, local.defaults.iosxe.configuration.system.ip_radius_source_interface_type, null) == "GigabitEthernet" ? try(trimprefix(local.device_config[each.value.name].system.ip_radius_source_interface_id, "$string "), local.defaults.iosxe.configuration.system.ip_radius_source_interface_id, null) : null