Abstract driver class & namespace fix