Adding support for attachments