Updated version of stats module