Have the ability to merge or overwrite devices based on MAC address perhaps? It would make custom fields much more useful if the information was persistent if the device had Windows reinstalled for instance.