* Improving stats handling