Added handling for similar tools