Change method for new datasource