Added Pintools and friends