Add support for additional attachments