Back-porting functionality to allow greater statistic gathering