diff --git a/src/eth/example/ADM_PCIE_9V3/fpga/rtl/fpga_core.sv b/src/eth/example/ADM_PCIE_9V3/fpga/rtl/fpga_core.sv
index 4f6ee13..27cbd1b 100644
--- a/src/eth/example/ADM_PCIE_9V3/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/ADM_PCIE_9V3/fpga/rtl/fpga_core.sv
@@ -89,9 +89,9 @@ wire qsfp_0_mgt_refclk_bufg;
 
 wire qsfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_tx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_tx[8]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_qsfp_tx_cpl[8]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_rx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_rx[8]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_qsfp_stat[2]();
 
 if (SIM) begin
diff --git a/src/eth/example/AS02MC04/fpga/rtl/fpga_core.sv b/src/eth/example/AS02MC04/fpga/rtl/fpga_core.sv
index 56660f1..36790b6 100644
--- a/src/eth/example/AS02MC04/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/AS02MC04/fpga/rtl/fpga_core.sv
@@ -105,9 +105,9 @@ assign sfp_mgt_refclk_out = sfp_mgt_refclk_bufg;
 
 wire sfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_tx[2]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[2]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[2]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_rx[2]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[2]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_sfp_stat();
 
 if (SIM) begin
diff --git a/src/eth/example/Alveo/fpga/rtl/fpga_core.sv b/src/eth/example/Alveo/fpga/rtl/fpga_core.sv
index b11b1a1..1236102 100644
--- a/src/eth/example/Alveo/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/Alveo/fpga/rtl/fpga_core.sv
@@ -231,12 +231,12 @@ assign eth_port_lpmode = '0;
 
 wire eth_gty_tx_clk[GTY_CNT];
 wire eth_gty_tx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_tx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_tx[GTY_CNT]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) eth_gty_axis_tx_cpl[GTY_CNT]();
 
 wire eth_gty_rx_clk[GTY_CNT];
 wire eth_gty_rx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_rx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_rx[GTY_CNT]();
 
 wire eth_gty_rx_status[GTY_CNT];
 
diff --git a/src/eth/example/Arty/fpga/rtl/fpga_core.sv b/src/eth/example/Arty/fpga/rtl/fpga_core.sv
index c135e55..0062015 100644
--- a/src/eth/example/Arty/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/Arty/fpga/rtl/fpga_core.sv
@@ -157,7 +157,7 @@ xfcp_stats_inst (
     .s_axis_stat(axis_mac_stat)
 );
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 taxi_eth_mac_mii_fifo #(
diff --git a/src/eth/example/HTG9200/fpga/rtl/fpga_core.sv b/src/eth/example/HTG9200/fpga/rtl/fpga_core.sv
index 2b4ac02..4abf8e4 100644
--- a/src/eth/example/HTG9200/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/HTG9200/fpga/rtl/fpga_core.sv
@@ -299,12 +299,12 @@ assign eth_port_resetl = {PORT_CNT{~eth_reset}};
 
 wire eth_gty_tx_clk[GTY_CNT];
 wire eth_gty_tx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_tx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_tx[GTY_CNT]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) eth_gty_axis_tx_cpl[GTY_CNT]();
 
 wire eth_gty_rx_clk[GTY_CNT];
 wire eth_gty_rx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_rx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_rx[GTY_CNT]();
 
 wire eth_gty_rx_status[GTY_CNT];
 
diff --git a/src/eth/example/HTG940/fpga/rtl/fpga_core.sv b/src/eth/example/HTG940/fpga/rtl/fpga_core.sv
index 999ff12..c8a40a4 100644
--- a/src/eth/example/HTG940/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/HTG940/fpga/rtl/fpga_core.sv
@@ -147,7 +147,7 @@ xfcp_stats_inst (
 );
 
 // BASE-T PHY
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 taxi_eth_mac_1g_rgmii_fifo #(
diff --git a/src/eth/example/HTG_ZRF8/fpga/rtl/fpga_core.sv b/src/eth/example/HTG_ZRF8/fpga/rtl/fpga_core.sv
index 8d5a72d..3d46e9f 100644
--- a/src/eth/example/HTG_ZRF8/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/HTG_ZRF8/fpga/rtl/fpga_core.sv
@@ -256,12 +256,12 @@ assign eth_port_resetl = {PORT_CNT{~eth_reset}};
 
 wire eth_gty_tx_clk[GTY_CNT];
 wire eth_gty_tx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_tx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_tx[GTY_CNT]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) eth_gty_axis_tx_cpl[GTY_CNT]();
 
 wire eth_gty_rx_clk[GTY_CNT];
 wire eth_gty_rx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_rx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_rx[GTY_CNT]();
 
 wire eth_gty_rx_status[GTY_CNT];
 
diff --git a/src/eth/example/KC705/fpga/rtl/fpga_core.sv b/src/eth/example/KC705/fpga/rtl/fpga_core.sv
index 7446327..555bde7 100644
--- a/src/eth/example/KC705/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/KC705/fpga/rtl/fpga_core.sv
@@ -212,11 +212,11 @@ stat_mux_inst (
 // BASE-T PHY
 assign phy_reset_n = !rst;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 if (BASET_PHY_TYPE == "GMII") begin : baset_mac_gmii
-    
+
     taxi_eth_mac_1g_gmii_fifo #(
         .SIM(SIM),
         .VENDOR(VENDOR),
@@ -305,7 +305,7 @@ if (BASET_PHY_TYPE == "GMII") begin : baset_mac_gmii
     assign phy_rgmii_tx_ctl = 1'b0;
 
 end else if (BASET_PHY_TYPE == "RGMII") begin : baset_mac_rgmii
-    
+
     taxi_eth_mac_1g_rgmii_fifo #(
         .SIM(SIM),
         .VENDOR(VENDOR),
@@ -392,7 +392,7 @@ end else if (BASET_PHY_TYPE == "RGMII") begin : baset_mac_rgmii
     assign phy_sgmii_txd = '0;
     assign phy_sgmii_tx_en = 1'b0;
     assign phy_sgmii_tx_er = 1'b0;
-    
+
 end else if (BASET_PHY_TYPE == "SGMII") begin : baset_mac_sgmii
 
     taxi_eth_mac_1g_fifo #(
@@ -491,7 +491,7 @@ end
 // SFP+
 assign sfp_tx_disable_b = 1'b1;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl();
 
 taxi_eth_mac_1g_fifo #(
diff --git a/src/eth/example/KCU105/fpga/rtl/fpga_core.sv b/src/eth/example/KCU105/fpga/rtl/fpga_core.sv
index 6f7a66d..20c01d4 100644
--- a/src/eth/example/KCU105/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/KCU105/fpga/rtl/fpga_core.sv
@@ -210,7 +210,7 @@ stat_mux_inst (
 // BASE-T PHY
 assign phy_reset_n = !rst;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 taxi_eth_mac_1g_fifo #(
@@ -300,10 +300,10 @@ assign sfp_tx_disable_b = '1;
 
 if (SFP_RATE == 0) begin : sfp_mac
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp0_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp0_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp0_tx_cpl();
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp1_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp1_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp1_tx_cpl();
 
     taxi_eth_mac_1g_fifo #(
@@ -487,9 +487,9 @@ end else begin : sfp_mac
 
     wire sfp_rst;
 
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_tx[2]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[2]();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[2]();
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_rx[2]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[2]();
 
     if (SIM) begin
 
diff --git a/src/eth/example/KR260/fpga/rtl/fpga_core.sv b/src/eth/example/KR260/fpga/rtl/fpga_core.sv
index a584bc9..1052c32 100644
--- a/src/eth/example/KR260/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/KR260/fpga/rtl/fpga_core.sv
@@ -99,11 +99,11 @@ module fpga_core #
 assign phy2_reset_n = !rst;
 assign phy3_reset_n = !rst;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_phy2_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_phy2_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_phy2_tx_cpl();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_phy2_stat();
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_phy3_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_phy3_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_phy3_tx_cpl();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_phy3_stat();
 
@@ -256,7 +256,7 @@ assign sfp_tx_disable = 1'b0;
 
 if (SFP_RATE == 0) begin : sfp_mac
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl();
     taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_sfp_stat();
 
@@ -353,9 +353,9 @@ end else begin : sfp_mac
 
     wire sfp_rst;
 
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_tx[0:0]();
-    taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[0:0]();
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_rx[0:0]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[1]();
+    taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[1]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[1]();
     taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_sfp_stat();
 
     if (SIM) begin
diff --git a/src/eth/example/Nexus_K3P_Q/fpga/rtl/fpga_core.sv b/src/eth/example/Nexus_K3P_Q/fpga/rtl/fpga_core.sv
index 17df53b..2465c4f 100644
--- a/src/eth/example/Nexus_K3P_Q/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/Nexus_K3P_Q/fpga/rtl/fpga_core.sv
@@ -104,9 +104,9 @@ assign qsfp_mgt_refclk_out = qsfp_mgt_refclk_bufg;
 
 wire qsfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_tx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_tx[8]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_qsfp_tx_cpl[8]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_rx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_rx[8]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_qsfp_stat[2]();
 
 if (SIM) begin
diff --git a/src/eth/example/Nexus_K3P_S/fpga/rtl/fpga_core.sv b/src/eth/example/Nexus_K3P_S/fpga/rtl/fpga_core.sv
index 9e9197d..8cc8b11 100644
--- a/src/eth/example/Nexus_K3P_S/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/Nexus_K3P_S/fpga/rtl/fpga_core.sv
@@ -85,9 +85,9 @@ assign sfp_mgt_refclk_out = sfp_mgt_refclk_bufg;
 
 wire sfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_tx[2]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[2]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[2]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_rx[2]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[2]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_sfp_stat();
 
 if (SIM) begin
diff --git a/src/eth/example/VCU108/fpga/rtl/fpga_core.sv b/src/eth/example/VCU108/fpga/rtl/fpga_core.sv
index a537475..6c20dfc 100644
--- a/src/eth/example/VCU108/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/VCU108/fpga/rtl/fpga_core.sv
@@ -199,7 +199,7 @@ stat_mux_inst (
 // BASE-T PHY
 assign phy_reset_n = !rst;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 taxi_eth_mac_1g_fifo #(
@@ -313,9 +313,9 @@ wire qsfp_mgt_refclk_0_bufg;
 
 wire qsfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_tx[4]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_tx[4]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_qsfp_tx_cpl[4]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_rx[4]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_rx[4]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_qsfp_stat();
 
 if (SIM) begin
diff --git a/src/eth/example/VCU118/fpga/rtl/fpga_core.sv b/src/eth/example/VCU118/fpga/rtl/fpga_core.sv
index b7d7e00..54440fa 100644
--- a/src/eth/example/VCU118/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/VCU118/fpga/rtl/fpga_core.sv
@@ -217,7 +217,7 @@ stat_mux_inst (
 // BASE-T PHY
 assign phy_reset_n = !rst_125mhz;
 
-taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth();
+taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_eth();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl();
 
 taxi_eth_mac_1g_fifo #(
@@ -488,9 +488,9 @@ wire qsfp1_mgt_refclk_0_bufg;
 
 wire qsfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_tx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_tx[8]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_qsfp_tx_cpl[8]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_rx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_rx[8]();
 
 if (SIM) begin
 
diff --git a/src/eth/example/XUPP3R/fpga/rtl/fpga_core.sv b/src/eth/example/XUPP3R/fpga/rtl/fpga_core.sv
index 6338b80..976120f 100644
--- a/src/eth/example/XUPP3R/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/XUPP3R/fpga/rtl/fpga_core.sv
@@ -197,12 +197,12 @@ assign eth_port_lpmode = '0;
 
 wire eth_gty_tx_clk[GTY_CNT];
 wire eth_gty_tx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_tx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_tx[GTY_CNT]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) eth_gty_axis_tx_cpl[GTY_CNT]();
 
 wire eth_gty_rx_clk[GTY_CNT];
 wire eth_gty_rx_rst[GTY_CNT];
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) eth_gty_axis_rx[GTY_CNT]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) eth_gty_axis_rx[GTY_CNT]();
 
 wire eth_gty_rx_status[GTY_CNT];
 
diff --git a/src/eth/example/ZCU102/fpga/rtl/fpga_core.sv b/src/eth/example/ZCU102/fpga/rtl/fpga_core.sv
index f8e3605..b29636d 100644
--- a/src/eth/example/ZCU102/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/ZCU102/fpga/rtl/fpga_core.sv
@@ -217,16 +217,16 @@ assign sfp_tx_disable_b = '1;
 
 if (SFP_RATE == 0) begin : sfp_mac
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp0_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp0_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp0_tx_cpl();
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp1_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp1_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp1_tx_cpl();
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp2_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp2_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp2_tx_cpl();
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp3_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp3_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp3_tx_cpl();
 
     taxi_eth_mac_1g_fifo #(
@@ -574,9 +574,9 @@ end else begin : sfp_mac
 
     wire sfp_rst;
 
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_tx[4]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[4]();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[4]();
-    taxi_axis_if #(.DATA_W(32), .ID_W(8)) axis_sfp_rx[4]();
+    taxi_axis_if #(.DATA_W(32), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[4]();
 
     if (SIM) begin
 
diff --git a/src/eth/example/ZCU106/fpga/rtl/fpga_core.sv b/src/eth/example/ZCU106/fpga/rtl/fpga_core.sv
index 8422fb5..028659a 100644
--- a/src/eth/example/ZCU106/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/ZCU106/fpga/rtl/fpga_core.sv
@@ -201,10 +201,10 @@ assign sfp_tx_disable_b = '1;
 
 if (SFP_RATE == 0) begin : sfp_mac
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp0_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp0_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp0_tx_cpl();
 
-    taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_sfp1_eth();
+    taxi_axis_if #(.DATA_W(8), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp1_eth();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp1_tx_cpl();
 
     taxi_eth_mac_1g_fifo #(
@@ -388,9 +388,9 @@ end else begin : sfp_mac
 
     wire sfp_rst;
 
-    taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_tx[2]();
+    taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[2]();
     taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[2]();
-    taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_rx[2]();
+    taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[2]();
 
     if (SIM) begin
 
diff --git a/src/eth/example/ZCU111/fpga/rtl/fpga_core.sv b/src/eth/example/ZCU111/fpga/rtl/fpga_core.sv
index b1cfa0f..1591504 100644
--- a/src/eth/example/ZCU111/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/ZCU111/fpga/rtl/fpga_core.sv
@@ -295,9 +295,9 @@ wire sfp_mgt_refclk_0_bufg;
 
 wire sfp_rst;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_tx[4]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_tx[4]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_sfp_tx_cpl[4]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_sfp_rx[4]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_sfp_rx[4]();
 
 if (SIM) begin
 
diff --git a/src/eth/example/fb2CG/fpga/rtl/fpga_core.sv b/src/eth/example/fb2CG/fpga/rtl/fpga_core.sv
index 55075cf..5443fb2 100644
--- a/src/eth/example/fb2CG/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/fb2CG/fpga/rtl/fpga_core.sv
@@ -117,9 +117,9 @@ assign led_exp = '1;
 
 wire [1:0] qsfp_gtpowergood;
 
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_tx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_tx[8]();
 taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_qsfp_tx_cpl[8]();
-taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8)) axis_qsfp_rx[8]();
+taxi_axis_if #(.DATA_W(MAC_DATA_W), .ID_W(8), .USER_EN(1), .USER_W(1)) axis_qsfp_rx[8]();
 taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_qsfp_stat[2]();
 
 wire qsfp_mgt_refclk_p[2];