Add support for accessing attachments