Changes to allow monitoring for mixed private/public environments