Rework new resque helpers