Some more work for monitoring client.