Addressing breaking IFileSystem changes

@pranavkm
Done.