Added driver models and handlers