added Bug Monitoring support