Addressing breaking IFileSystem changes

@pranavkm
Yes. Unless there are any concerns.