Addressing Review Comments and refactoring Statistics Framework to use Event System.