migrate to new default datasource system