Refactor welcome and notification workers