Added empty handling of file fields for now