Refactoring WorkCB -> WorkEvent