Adding tools and traces