Adding ability to capture attachments