Reworking the AntiVirusWorker