UPD job module refactoring