Updated DataSource interface