Task us22 ingest sevice refactoring

-1