Added TextAttachment support