Update notes for submitted changes

* Refactor the driver fields mapping