added feature for attachments