Moved attachments to helper