Make status update on agents properly