Fix model and datasource configurations