Task us22 ingest sevice refactoring