Added MAC address as device ID