More work on adapting ingest modules to new infrastructure