Start of integration of MAC authentication