Finalize configuration model
Correct a typo in func name and adjust driver handling