Improved how statistics are handled and refactored strata enumeration