Make the data-coordinator's API a little more uniform