diff --git a/src/mgw_nat.erl b/src/mgw_nat.erl
index 00d0225..9242816 100644
--- a/src/mgw_nat.erl
+++ b/src/mgw_nat.erl
@@ -48,6 +48,7 @@
 %-include_lib("kernel/include/inet.hrl").
 %-include_lib("kernel/include/inet_sctp.hrl").
 
+-include_lib("osmo_ss7/include/xua.hrl").
 -include_lib("osmo_ss7/include/m2ua.hrl").
 -include_lib("osmo_ss7/include/mtp3.hrl").
 -include_lib("osmo_ss7/include/isup.hrl").
@@ -55,13 +56,13 @@
 
 % mangle the received data
 mangle_rx_data(From, Path, Data, Fn) when is_list(Path), is_binary(Data) ->
-	{ok, M2ua} = m2ua_codec:parse_m2ua_msg(Data),
+	M2ua = m2ua_codec:parse_m2ua_msg(Data),
 	%io:format("M2UA Decode: ~p~n", [M2ua]),
 	case M2ua of
-		#m2ua_msg{msg_class = ?M2UA_MSGC_MAUP,
+		#xua_msg{msg_class = ?M2UA_MSGC_MAUP,
 			  msg_type = ?M2UA_MAUP_MSGT_DATA} ->
 			M2ua_out = mangle_rx_m2ua_maup(Fn, From, Path, M2ua);
-		#m2ua_msg{} ->
+		#xua_msg{} ->
 			% simply pass it along unmodified
 			M2ua_out = M2ua
 	end,
@@ -70,7 +71,7 @@ mangle_rx_data(From, Path, Data, Fn) when is_list(Path), is_binary(Data) ->
 	m2ua_codec:encode_m2ua_msg(M2ua_out).
 
 % mangle the received M2UA
-mangle_rx_m2ua_maup(Fn, From, Path, M2ua = #m2ua_msg{parameters = Params}) ->
+mangle_rx_m2ua_maup(Fn, From, Path, M2ua = #xua_msg{payload = Params}) ->
 	{_Len, M2uaPayload} = proplists:get_value(16#300, Params),
 	Mtp3 = mtp3_codec:parse_mtp3_msg(M2uaPayload),
 	%io:format("MTP3 Decode: ~p~n", [Mtp3]),
@@ -80,7 +81,7 @@ mangle_rx_m2ua_maup(Fn, From, Path, M2ua = #m2ua_msg{parameters = Params}) ->
 	Params2 = proplists:delete(16#300, Params),
 	ParamsNew = Params2 ++ [{16#300, {byte_size(Mtp3OutBin), Mtp3OutBin}}],
 	% return mangled parsed m2ua msg
-	M2ua#m2ua_msg{parameters = ParamsNew}.
+	M2ua#xua_msg{payload = ParamsNew}.
 
 % mangle the MTP3 payload
 mangle_rx_mtp3(Fn, From, Path, Mtp3 = #mtp3_msg{service_ind = Service}) ->