Add support for custom tools