Remove the useage of DataSource.create