Stats implementation change