Make the addition of the DataSource interface backwards compatible