AttachmentTO changes