Refactoring on Rovi restartable ingest