Reorganized statistics classes