added attachment support