Added PUPPI tools