More changes for the new tools config