Added more monitoring