Another step on stats refactoring