refactor for ingest steps inclusion