Updated to include MAC address