Add the handling of File