Added machine_id