Made small changes to support our non-standard file fields. Got a