Support for additional file attachments

@mattprecious