Added more monitoring points