Add more statistics and monitoring