Add the possibility to change the distributor