Make machine_monitoring more robus