Use MAC address as device id for measurements
Added comments