Added file attachments support