Changed WorkerThread logic from group to per task