Improve performance monitor