Enhance data statistic component