Added handling for new 'File' type