Enhance the clamav plugin