Added File with stream support