Simplify Driver classes