update to moving this project into Monitoring lib