Refactor save up into variaous adapters used by job