Add Mac Address, Remove OpenUUID