updated Driver with new classes