Add support for File attachment
WIP