Added handler for attachments