Refactoring Nitro ingest