Changed approach of saving statistics