Refactored the update stats counting to a single class	

Builds on #457