Final modifications to handle the variability in two libraries as a developper would want to do it.