Addressing build warnings - Monitoring