Ingest steps rework to implement a new type (ONTIME-319)