Refactoring ingest