Monitoring: add more monitoring