Improve granularity of DJ monitoring

Cc: @shevaun