revamped the monitoring data model to be most useful