Added types to attachments