Added content attachment support