Account for attachments in manifest and batch processing