Added defines in DataSource