Added attachment support