Add conditionnal support of dynamic bindings