diff --git a/iosxe_flow.tf b/iosxe_flow.tf
index c2a8969..47bbc01 100644
--- a/iosxe_flow.tf
+++ b/iosxe_flow.tf
@@ -114,6 +114,7 @@ locals {
         match_connection_server_ipv4_address                 = try(record.match.connection_server_ipv4_address, local.defaults.iosxe.device_config.flow.records.match.connection_server_ipv4_address, null)
         match_connection_server_ipv6_address                 = try(record.match.connection_server_ipv6_address, local.defaults.iosxe.device_config.flow.records.match.connection_server_ipv6_address, null)
         match_connection_server_transport_port               = try(record.match.connection_server_transport_port, local.defaults.iosxe.device_config.flow.records.match.connection_server_transport_port, null)
+        match_datalink_vlan                                  = try(record.match.datalink_vlan, local.defaults.iosxe.device_config.flow.records.match.datalink_vlan, null)
         match_flow_direction                                 = try(record.match.flow_direction, local.defaults.iosxe.device_config.flow.records.match.flow_direction, null)
         match_flow_observation_point                         = try(record.match.flow_observation_point, local.defaults.iosxe.device_config.flow.records.match.flow_observation_point, null)
         match_interface_input                                = try(record.match.interface_input, local.defaults.iosxe.device_config.flow.records.match.interface_input, null)
@@ -126,11 +127,14 @@ locals {
         match_ipv6_protocol                                  = try(record.match.ipv6_protocol, local.defaults.iosxe.device_config.flow.records.match.ipv6_protocol, null)
         match_ipv6_source_address                            = try(record.match.ipv6_source_address, local.defaults.iosxe.device_config.flow.records.match.ipv6_source_address, null)
         match_ipv6_version                                   = try(record.match.ipv6_version, local.defaults.iosxe.device_config.flow.records.match.ipv6_version, null)
+        match_routing_vrf_input                              = try(record.match.routing_vrf_input, local.defaults.iosxe.device_config.flow.records.match.routing_vrf_input, null)
         match_transport_destination_port                     = try(record.match.transport_destination_port, local.defaults.iosxe.device_config.flow.records.match.transport_destination_port, null)
         match_transport_source_port                          = try(record.match.transport_source_port, local.defaults.iosxe.device_config.flow.records.match.transport_source_port, null)
+        match_vxlan_vnid                                     = try(record.match.vxlan_vnid, local.defaults.iosxe.device_config.flow.records.match.vxlan_vnid, null)
+        match_vxlan_vtep_input                               = try(record.match.vxlan_vtep_input, local.defaults.iosxe.device_config.flow.records.match.vxlan_vtep_input, null)
+        match_vxlan_vtep_output                              = try(record.match.vxlan_vtep_output, local.defaults.iosxe.device_config.flow.records.match.vxlan_vtep_output, null)
         match_datalink_mac_source_address_input              = try(record.match.datalink_mac_source_address_input, local.defaults.iosxe.device_config.flow.records.match.datalink_mac_source_address_input, null)
         match_datalink_mac_destination_address_input         = try(record.match.datalink_mac_destination_address_input, local.defaults.iosxe.device_config.flow.records.match.datalink_mac_destination_address_input, null)
-        match_datalink_vlan                                  = try(record.match.datalink_vlan, local.defaults.iosxe.device_config.flow.records.match.datalink_vlan, null)
         match_datalink_source_vlan_id                        = try(record.match.datalink_source_vlan_id, local.defaults.iosxe.device_config.flow.records.match.datalink_source_vlan_id, null)
         match_datalink_destination_vlan_id                   = try(record.match.datalink_destination_vlan_id, local.defaults.iosxe.device_config.flow.records.match.datalink_destination_vlan_id, null)
         match_ipv4_ttl                                       = try(record.match.ipv4_ttl, local.defaults.iosxe.device_config.flow.records.match.ipv4_ttl, null)
@@ -163,6 +167,7 @@ resource "iosxe_flow_record" "flow_record" {
   match_connection_server_ipv4_address                 = each.value.match_connection_server_ipv4_address
   match_connection_server_ipv6_address                 = each.value.match_connection_server_ipv6_address
   match_connection_server_transport_port               = each.value.match_connection_server_transport_port
+  match_datalink_vlan                                  = each.value.match_datalink_vlan
   match_flow_direction                                 = each.value.match_flow_direction
   match_flow_observation_point                         = each.value.match_flow_observation_point
   match_interface_input                                = each.value.match_interface_input
@@ -175,11 +180,14 @@ resource "iosxe_flow_record" "flow_record" {
   match_ipv6_protocol                                  = each.value.match_ipv6_protocol
   match_ipv6_source_address                            = each.value.match_ipv6_source_address
   match_ipv6_version                                   = each.value.match_ipv6_version
+  match_routing_vrf_input                              = each.value.match_routing_vrf_input
   match_transport_destination_port                     = each.value.match_transport_destination_port
   match_transport_source_port                          = each.value.match_transport_source_port
+  match_vxlan_vnid                                     = each.value.match_vxlan_vnid
+  match_vxlan_vtep_input                               = each.value.match_vxlan_vtep_input
+  match_vxlan_vtep_output                              = each.value.match_vxlan_vtep_output
   match_datalink_mac_source_address_input              = each.value.match_datalink_mac_source_address_input
   match_datalink_mac_destination_address_input         = each.value.match_datalink_mac_destination_address_input
-  match_datalink_vlan                                  = each.value.match_datalink_vlan
   match_datalink_source_vlan_id                        = each.value.match_datalink_source_vlan_id
   match_datalink_destination_vlan_id                   = each.value.match_datalink_destination_vlan_id
   match_ipv4_ttl                                       = each.value.match_ipv4_ttl