Removed the Statistics class and moved methods to respective resources