Refactored workers implementation