Performance stats refactor