Fix reference to DataSource