added file attachments support