Updated Statistics class