Refactor IFileClient implementation