Moved statistics to single file