Restructure StatHat calls