More flexibility in file fetching