More work on ingest framework