Touchup to include both pistatsd and pistatsview usage