Updated to match latest version of C driver