Continue refactoring of ingest job configuration