add better stats support