Add more collection checking to ingest