Restructure driver registration structures a bit so it is easier to add new fields (and also reduce some memory usage/leaks).