Add file provider abstraction
Use new file abstraction method