Added macAddress column to locationPoint