VID-1651 Add back in some needed data points