Added mac address support