updated DataObserver to match the DataWarehouse