Work towards converting core ingest modules to new ingest API