MNT: Major update to data broker