Improved tool implementation.