Store machine name as well