*8996* Porting stats fixes

Are we not using abstract class/method because of backwards compatibility?