Revised ingest modules API for 3.1 release