Updated Tool verification