Fix up model dumps collection to reflect latest datastores