Dev branch cloned into local files

Update driver model and cfg
cfg change