Add the schema and table names from data files when possible

[davidducos]

Add the schema and table names from data files when possible but not the extra info that could be loaded later on, to avoid renqueuing on the intermediate queue.