Improved stats handling