Add better attachments calling