Added support for re-ordering the tools.