Better handling of attachments.