Adding more monitoring features