Add conditionnal support of bindings version 2