Add Support for driver version 2.0.x