New schema as discussed on the firmware-dev ml, cf this thread: