Add mac address and interface name support